diff --git a/client/.prettierrc b/client/.prettierrc
index 659512272fb..9f1ed89080f 100644
--- a/client/.prettierrc
+++ b/client/.prettierrc
@@ -4,5 +4,6 @@
     "trailingComma": "es5",
     "tabWidth": 4,
     "semi": true,
-    "singleQuote": true
+    "singleQuote": true,
+    "plugins": ["prettier-plugin-tailwindcss"]
 }
diff --git a/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx b/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
index 38ddd7f3cb6..10b3e1c72b3 100644
--- a/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
+++ b/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
@@ -170,7 +170,7 @@ const ApiClientTable = ({apiClients}: ApiClientTableProps) => {
                                     className={twMerge(
                                         'whitespace-nowrap',
                                         cell.id.endsWith('actions') && 'flex justify-end',
-                                        cell.id.endsWith('enabled') && 'flex ml-6'
+                                        cell.id.endsWith('enabled') && 'ml-6 flex'
                                     )}
                                     key={cell.id}
                                     onClick={(event) => {
diff --git a/client/src/ee/pages/automation/api-platform/api-collections/components/ApiCollectionEndpointListItem.tsx b/client/src/ee/pages/automation/api-platform/api-collections/components/ApiCollectionEndpointListItem.tsx
index dca487c3c5e..b3d17b81878 100644
--- a/client/src/ee/pages/automation/api-platform/api-collections/components/ApiCollectionEndpointListItem.tsx
+++ b/client/src/ee/pages/automation/api-platform/api-collections/components/ApiCollectionEndpointListItem.tsx
@@ -86,7 +86,7 @@ const ApiCollectionEndpointListItem = ({
             <div className="flex flex-1 items-center">
                 <Badge
                     className={twMerge(
-                        'w-20 mr-4 border-transparent',
+                        'mr-4 w-20 border-transparent',
                         apiCollectionEndpoint.httpMethod === 'DELETE' && 'bg-red-400',
                         apiCollectionEndpoint.httpMethod === 'GET' && 'bg-blue-400',
                         apiCollectionEndpoint.httpMethod === 'POST' && 'bg-green-400',
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
index c553e89dfcf..74b60c33e01 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
@@ -20,7 +20,7 @@ const ApiConnectorEndpointListItem = ({apiConnectorEndpoint}: {apiConnectorEndpo
                 <div className="flex flex-1 items-center">
                     <Badge
                         className={twMerge(
-                            'w-20 mr-4 border-transparent',
+                            'mr-4 w-20 border-transparent',
                             apiConnectorEndpoint.httpMethod === 'DELETE' && 'bg-red-400',
                             apiConnectorEndpoint.httpMethod === 'GET' && 'bg-blue-400',
                             apiConnectorEndpoint.httpMethod === 'POST' && 'bg-green-400',
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
index 49e1bf079f9..a8602d2e5e0 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
@@ -81,7 +81,7 @@ const ApiConnectorListItem = ({apiConnector}: ApiConnectorItemProps) => {
                                     <TooltipContent>{apiConnector.description}</TooltipContent>
                                 </Tooltip>
                             ) : (
-                                <div className="space-x-1 ">
+                                <div className="space-x-1">
                                     <span className="font-semibold">{apiConnector.title}</span>
 
                                     <span>-</span>
diff --git a/client/src/pages/account/public/Login.tsx b/client/src/pages/account/public/Login.tsx
index a5e635593ec..3c632bab1f8 100644
--- a/client/src/pages/account/public/Login.tsx
+++ b/client/src/pages/account/public/Login.tsx
@@ -118,7 +118,7 @@ const Login = () => {
                                 control={form.control}
                                 name="rememberMe"
                                 render={({field}) => (
-                                    <FormItem className="flex items-center space-x-3 space-y-0 ">
+                                    <FormItem className="flex items-center space-x-3 space-y-0">
                                         <FormControl>
                                             <Checkbox checked={field.value} onCheckedChange={field.onChange} />
                                         </FormControl>
diff --git a/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialog.tsx b/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialog.tsx
index 4cb99721b20..073fd4b9722 100644
--- a/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialog.tsx
+++ b/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialog.tsx
@@ -285,7 +285,7 @@ const ProjectInstanceDialog = ({
                                                     'group flex flex-col border-l-4 py-2 pl-4 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4',
                                                     index <= activeStepIndex
                                                         ? 'border-gray-900 hover:border-gray-800'
-                                                        : 'border-gray-200 hover:border-gray-30'
+                                                        : 'hover:border-gray-30 border-gray-200'
                                                 )}
                                             ></div>
                                         </li>
diff --git a/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialogBasicStepProjectsComboBox.tsx b/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialogBasicStepProjectsComboBox.tsx
index de480e5017f..ab10698e54b 100644
--- a/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialogBasicStepProjectsComboBox.tsx
+++ b/client/src/pages/automation/project-instances/components/project-instance-dialog/ProjectInstanceDialogBasicStepProjectsComboBox.tsx
@@ -6,7 +6,7 @@ import {FocusEventHandler} from 'react';
 
 const ProjectLabel = ({project}: {project: Project}) => (
     <div className="flex items-center">
-        <span className="mr-1 ">{project.name}</span>
+        <span className="mr-1">{project.name}</span>
 
         <span className="text-xs text-gray-500">{project?.tags?.map((tag) => tag.name).join(', ')}</span>
     </div>
diff --git a/client/src/pages/automation/project/components/projects-sidebar/ProjectsSidebar.tsx b/client/src/pages/automation/project/components/projects-sidebar/ProjectsSidebar.tsx
index 3b7128ccf4b..36beb40a9fb 100644
--- a/client/src/pages/automation/project/components/projects-sidebar/ProjectsSidebar.tsx
+++ b/client/src/pages/automation/project/components/projects-sidebar/ProjectsSidebar.tsx
@@ -25,7 +25,7 @@ const ProjectsSidebar = ({projectId}: {projectId: number}) => {
                 projects.map((curProject) => (
                     <div
                         className={twMerge(
-                            'py-3 px-2 flex cursor-pointer items-center justify-between hover:bg-background/50 rounded-lg text-sm',
+                            'flex cursor-pointer items-center justify-between rounded-lg px-2 py-3 text-sm hover:bg-background/50',
                             curProject.id === projectId && 'bg-background/50'
                         )}
                         key={curProject.id}
diff --git a/client/src/pages/automation/workflow-executions/WorkflowExecutions.tsx b/client/src/pages/automation/workflow-executions/WorkflowExecutions.tsx
index 9cee068bf5e..c4350462937 100644
--- a/client/src/pages/automation/workflow-executions/WorkflowExecutions.tsx
+++ b/client/src/pages/automation/workflow-executions/WorkflowExecutions.tsx
@@ -54,7 +54,7 @@ const jobStatusOptions = [
 
 const ProjectLabel = ({project}: {project: Project}) => (
     <div className="flex items-center">
-        <span className="mr-1 ">{project.name}</span>
+        <span className="mr-1">{project.name}</span>
 
         <span className="text-xs text-gray-500">{project?.tags?.map((tag) => tag.name).join(', ')}</span>
     </div>
@@ -391,7 +391,7 @@ export const WorkflowExecutions = () => {
                                     ? projectInstances?.map((projectInstance) => ({
                                           label: (
                                               <span className="flex items-center">
-                                                  <span className="mr-1 ">
+                                                  <span className="mr-1">
                                                       {projectInstance.name} V{projectInstance.projectVersion}
                                                   </span>
 
diff --git a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
index 40e6b684f80..b8135cbbda1 100644
--- a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
+++ b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
@@ -28,7 +28,7 @@ const WorkflowExecutionSheetAccordion = ({job, triggerExecution}: {job: Job; tri
                     <span
                         className={twMerge(
                             (!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
-                            'font-semibold uppercase text-base'
+                            'text-base font-semibold uppercase'
                         )}
                     >
                         {taskExecutionsCompleted && triggerExecutionCompleted ? 'Workflow executed' : 'Workflow failed'}
diff --git a/client/src/pages/embedded/connected-users/ConnectedUsers.tsx b/client/src/pages/embedded/connected-users/ConnectedUsers.tsx
index 4d1383e99c1..815b88a63b3 100644
--- a/client/src/pages/embedded/connected-users/ConnectedUsers.tsx
+++ b/client/src/pages/embedded/connected-users/ConnectedUsers.tsx
@@ -93,7 +93,7 @@ export function DatePickerWithRange({
 
 const IntegrationLabel = ({integration}: {integration: Integration}) => (
     <div className="flex items-center">
-        <span className="mr-1 ">{integration.componentName}</span>
+        <span className="mr-1">{integration.componentName}</span>
 
         <span className="text-xs text-gray-500">{integration?.tags?.map((tag) => tag.name).join(', ')}</span>
     </div>
diff --git a/client/src/pages/embedded/connected-users/components/ConnectedUserTable.tsx b/client/src/pages/embedded/connected-users/components/ConnectedUserTable.tsx
index 187f9d4ebb0..476e3e5c0cd 100644
--- a/client/src/pages/embedded/connected-users/components/ConnectedUserTable.tsx
+++ b/client/src/pages/embedded/connected-users/components/ConnectedUserTable.tsx
@@ -219,7 +219,7 @@ const ConnectedUserTable = ({connectedUsers}: ConnectedUserTableProps) => {
                                             !connectedUsers[row.index].enabled && 'text-muted-foreground',
                                             cell.id.endsWith('actions') && 'flex justify-end',
                                             cell.id.endsWith('enabled') && 'flex justify-center',
-                                            cell.id.endsWith('status') && 'pl-8 '
+                                            cell.id.endsWith('status') && 'pl-8'
                                         )}
                                         key={cell.id}
                                         onClick={(event) => {
diff --git a/client/src/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx b/client/src/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
index e8c3b6eb385..e017bf7ae84 100644
--- a/client/src/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
+++ b/client/src/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
@@ -72,7 +72,7 @@ const ConnectedUserSheetPanelIntegrationListItem = ({
 
                                 <div
                                     className={twMerge(
-                                        'text-base font-semibold flex items-center space-x-1',
+                                        'flex items-center space-x-1 text-base font-semibold',
                                         !connectedUserIntegrationInstance.enabled && 'text-muted-foreground'
                                     )}
                                 >
@@ -81,7 +81,7 @@ const ConnectedUserSheetPanelIntegrationListItem = ({
                             </div>
 
                             <div className="flex gap-4">
-                                <div className="flex  items-center space-x-1 text-xs text-muted-foreground">
+                                <div className="flex items-center space-x-1 text-xs text-muted-foreground">
                                     <CredentialsStatus
                                         enabled={connectedUserIntegrationInstance.credentialStatus === 'VALID'}
                                     />
diff --git a/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialog.tsx b/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialog.tsx
index 2951ea55450..16664854561 100644
--- a/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialog.tsx
+++ b/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialog.tsx
@@ -359,7 +359,7 @@ const IntegrationInstanceConfigurationDialog = ({
                                                         'group flex flex-col border-l-4 py-2 pl-4 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4',
                                                         index <= activeStepIndex
                                                             ? 'border-gray-900 hover:border-gray-800'
-                                                            : 'border-gray-200 hover:border-gray-30'
+                                                            : 'hover:border-gray-30 border-gray-200'
                                                     )}
                                                 ></div>
                                             </li>
diff --git a/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogBasicStepIntegrationsComboBox.tsx b/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogBasicStepIntegrationsComboBox.tsx
index a976243c468..bc4ead3f741 100644
--- a/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogBasicStepIntegrationsComboBox.tsx
+++ b/client/src/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogBasicStepIntegrationsComboBox.tsx
@@ -16,7 +16,7 @@ const IntegrationLabel = ({
     <div className="flex items-center gap-2">
         {componentDefinition?.icon && <InlineSVG className="size-6 flex-none" src={componentDefinition.icon} />}
 
-        <span className="mr-1 ">{integration.name}</span>
+        <span className="mr-1">{integration.name}</span>
 
         <span className="text-xs text-gray-500">{integration?.tags?.map((tag) => tag.name).join(', ')}</span>
     </div>
diff --git a/client/src/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebar.tsx b/client/src/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebar.tsx
index 8f3d1a50002..dc1e933b7ec 100644
--- a/client/src/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebar.tsx
+++ b/client/src/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebar.tsx
@@ -26,7 +26,7 @@ const IntegrationsSidebar = ({integrationId}: {integrationId: number}) => {
                     .map((curIntegration) => (
                         <div
                             className={twMerge(
-                                'py-3 px-2 flex cursor-pointer items-center justify-between hover:bg-background/50 rounded-lg text-sm',
+                                'flex cursor-pointer items-center justify-between rounded-lg px-2 py-3 text-sm hover:bg-background/50',
                                 curIntegration.id === integrationId && 'bg-background/50'
                             )}
                             key={curIntegration.id}
diff --git a/client/src/pages/embedded/workflow-executions/WorkflowExecutions.tsx b/client/src/pages/embedded/workflow-executions/WorkflowExecutions.tsx
index 47d438549fb..44e695b886d 100644
--- a/client/src/pages/embedded/workflow-executions/WorkflowExecutions.tsx
+++ b/client/src/pages/embedded/workflow-executions/WorkflowExecutions.tsx
@@ -53,7 +53,7 @@ const jobStatusOptions = [
 
 const IntegrationLabel = ({integration}: {integration: Integration}) => (
     <div className="flex items-center">
-        <span className="mr-1 ">{integration.componentName}</span>
+        <span className="mr-1">{integration.componentName}</span>
 
         <span className="text-xs text-gray-500">{integration?.tags?.map((tag) => tag.name).join(', ')}</span>
     </div>
@@ -394,7 +394,7 @@ export const WorkflowExecutions = () => {
                                     ? integrationInstanceConfigurations?.map((integrationInstanceConfiguration) => ({
                                           label: (
                                               <span className="flex items-center">
-                                                  <span className="mr-1 ">
+                                                  <span className="mr-1">
                                                       {
                                                           (integrationInstanceConfiguration.integration as Integration)
                                                               ?.componentName
diff --git a/client/src/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx b/client/src/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
index 47ffdf2db3c..476e29c90d9 100644
--- a/client/src/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
+++ b/client/src/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
@@ -28,7 +28,7 @@ const WorkflowExecutionSheetAccordion = ({job, triggerExecution}: {job: Job; tri
                     <span
                         className={twMerge(
                             (!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
-                            'font-semibold uppercase text-base'
+                            'text-base font-semibold uppercase'
                         )}
                     >
                         {taskExecutionsCompleted && triggerExecutionCompleted ? 'Workflow executed' : 'Workflow failed'}
diff --git a/client/src/pages/home/Home.tsx b/client/src/pages/home/Home.tsx
index 8bf47970709..c2bb9a0d150 100644
--- a/client/src/pages/home/Home.tsx
+++ b/client/src/pages/home/Home.tsx
@@ -37,7 +37,7 @@ const Home = () => {
             <Dialog.Portal>
                 <Dialog.Overlay className="fixed inset-0 z-50 bg-black/80" />
 
-                <Dialog.Content className="fixed left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2 bg-background p-4 shadow-lg  sm:rounded-lg">
+                <Dialog.Content className="fixed left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2 bg-background p-4 shadow-lg sm:rounded-lg">
                     <div className="mx-auto flex h-full items-center">
                         <div className="grid grid-cols-2 gap-4">
                             <div>
diff --git a/client/src/pages/platform/connection/components/ComponentSelectionInput.tsx b/client/src/pages/platform/connection/components/ComponentSelectionInput.tsx
index 4f2abcbb754..e7a9763736b 100644
--- a/client/src/pages/platform/connection/components/ComponentSelectionInput.tsx
+++ b/client/src/pages/platform/connection/components/ComponentSelectionInput.tsx
@@ -39,7 +39,7 @@ const ComponentSelectionInput = ({
                 <>
                     {selectedComponentDefinition?.icon ? (
                         <div className="relative">
-                            <span className="pointer-events-none absolute inset-y-0 left-0 flex items-center rounded-l-md  px-3">
+                            <span className="pointer-events-none absolute inset-y-0 left-0 flex items-center rounded-l-md px-3">
                                 <InlineSVG className="size-4" src={selectedComponentDefinition.icon} />
                             </span>
 
diff --git a/client/src/pages/platform/connection/components/ConnectionParameters.tsx b/client/src/pages/platform/connection/components/ConnectionParameters.tsx
index b4da4d873a9..0a0aaf48781 100644
--- a/client/src/pages/platform/connection/components/ConnectionParameters.tsx
+++ b/client/src/pages/platform/connection/components/ConnectionParameters.tsx
@@ -57,7 +57,7 @@ const ConnectionParameters = ({
                     existingAuthorizations.map((authorization) => (
                         <Fragment key={authorization.name}>
                             <li className="flex">
-                                <span className="w-1/3  font-medium text-muted-foreground">Authorization:</span>
+                                <span className="w-1/3 font-medium text-muted-foreground">Authorization:</span>
 
                                 <span>{authorization.title}</span>
                             </li>
diff --git a/client/src/pages/platform/settings/api-keys/components/ApiKeyTable.tsx b/client/src/pages/platform/settings/api-keys/components/ApiKeyTable.tsx
index 19632432b5a..576cacdb5e2 100644
--- a/client/src/pages/platform/settings/api-keys/components/ApiKeyTable.tsx
+++ b/client/src/pages/platform/settings/api-keys/components/ApiKeyTable.tsx
@@ -171,7 +171,7 @@ const ApiKeyTable = ({apiKeys}: ApiKeyTableProps) => {
                                     className={twMerge(
                                         'whitespace-nowrap',
                                         cell.id.endsWith('actions') && 'flex justify-end',
-                                        cell.id.endsWith('enabled') && 'flex ml-6'
+                                        cell.id.endsWith('enabled') && 'ml-6 flex'
                                     )}
                                     key={cell.id}
                                     onClick={(event) => {
diff --git a/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditor.tsx b/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditor.tsx
index 699a8806187..e7a8d201b8e 100644
--- a/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditor.tsx
+++ b/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditor.tsx
@@ -68,7 +68,7 @@ const PropertyCodeEditor = forwardRef<HTMLButtonElement, PropertyCodeEditorProps
                     )}
 
                     <div className={twMerge([label && 'mt-1', leadingIcon && 'relative'])}>
-                        <div className={twMerge(leadingIcon && 'relative rounded-md flex w-full')}>
+                        <div className={twMerge(leadingIcon && 'relative flex w-full rounded-md')}>
                             {leadingIcon && (
                                 <div className="pointer-events-none absolute inset-y-0 left-0 flex items-center rounded-l-md border border-input bg-gray-100 px-3">
                                     {leadingIcon}
diff --git a/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditorSheetConnectionsSheet.tsx b/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditorSheetConnectionsSheet.tsx
index 124e8877a87..0e053777bfe 100644
--- a/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditorSheetConnectionsSheet.tsx
+++ b/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditorSheetConnectionsSheet.tsx
@@ -289,7 +289,7 @@ const ConnectionSelect = ({
                         connections.map((connection) => (
                             <SelectItem key={connection.id} value={connection.id!.toString()}>
                                 <div className="flex items-center">
-                                    <span className="mr-1 ">{connection.name}</span>
+                                    <span className="mr-1">{connection.name}</span>
 
                                     <span className="text-xs text-gray-500">
                                         {connection?.tags?.map((tag) => tag.name).join(', ')}
diff --git a/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyMentionsInput/PropertyMentionsInput.tsx b/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyMentionsInput/PropertyMentionsInput.tsx
index 35b666ddeea..0680ebbb519 100644
--- a/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyMentionsInput/PropertyMentionsInput.tsx
+++ b/client/src/pages/platform/workflow-editor/components/Properties/components/PropertyMentionsInput/PropertyMentionsInput.tsx
@@ -321,7 +321,7 @@ const PropertyMentionsInput = forwardRef(
 
                     <ReactQuill
                         className={twMerge(
-                            'h-full w-full bg-white rounded-md',
+                            'h-full w-full rounded-md bg-white',
                             leadingIcon && 'border-0 pl-10',
                             controlType === 'TEXT_AREA' && 'min-h-32',
                             className
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
index 42a13060a16..31040c76c73 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
@@ -41,7 +41,7 @@ const WorkflowExecutionsTestOutputHeader = ({
                 <span
                     className={twMerge(
                         (!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
-                        'font-semibold uppercase text-sm'
+                        'text-sm font-semibold uppercase'
                     )}
                 >
                     {taskExecutionsCompleted && triggerExecutionCompleted ? 'Workflow executed' : 'Workflow failed'}
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
index e5fd48b9331..66d91f0827b 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
@@ -510,6 +510,14 @@ const WorkflowNodeDetailsPanel = ({
     const operationDataMissing =
         currentComponent?.operationName && (!matchingOperation?.name || !currentOperationFetched);
 
+    const tabDataExists =
+        (!currentNode?.trigger && !currentNode?.taskDispatcher && currentActionFetched) ||
+        currentNode?.taskDispatcher ||
+        (currentNode?.trigger &&
+            currentTriggerFetched &&
+            nodeTabs.length > 1 &&
+            currentNode.componentName !== 'manual');
+
     if (!workflowNodeDetailsPanelOpen || !currentNode?.name || !currentTaskData) {
         return <></>;
     }
@@ -587,15 +595,12 @@ const WorkflowNodeDetailsPanel = ({
                             />
                         )}
 
-                    {((!currentNode?.trigger && !currentNode?.taskDispatcher && currentActionFetched) ||
-                        currentNode?.taskDispatcher ||
-                        (currentNode?.trigger && currentTriggerFetched)) &&
-                    nodeTabs.length > 1 ? (
+                    {tabDataExists && (
                         <div className="flex justify-center">
                             {nodeTabs.map((tab) => (
                                 <Button
                                     className={twMerge(
-                                        'grow justify-center whitespace-nowrap rounded-none border-0 border-b border-gray-200 bg-white text-sm font-medium py-5 text-gray-500 hover:border-blue-500 hover:text-blue-500 focus:border-blue-500 focus:text-blue-500 focus:outline-none',
+                                        'grow justify-center whitespace-nowrap rounded-none border-0 border-b border-gray-200 bg-white py-5 text-sm font-medium text-gray-500 hover:border-blue-500 hover:text-blue-500 focus:border-blue-500 focus:text-blue-500 focus:outline-none',
                                         activeTab === tab?.name && 'border-blue-500 text-blue-500 hover:text-blue-500'
                                     )}
                                     key={tab.name}
@@ -607,7 +612,9 @@ const WorkflowNodeDetailsPanel = ({
                                 </Button>
                             ))}
                         </div>
-                    ) : (
+                    )}
+
+                    {currentNode.componentName !== 'manual' && !tabDataExists && (
                         <div className="flex justify-center space-x-2 border-b border-gray-200 p-2">
                             <Skeleton className="h-6 w-1/4" />
 
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenu.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenu.tsx
index 06e9bd2291c..3bac8427646 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenu.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenu.tsx
@@ -112,7 +112,7 @@ const WorkflowNodesPopoverMenu = ({
             <PopoverContent
                 align="start"
                 className={twMerge(
-                    'flex p-0 will-change-auto rounded-lg',
+                    'flex rounded-lg p-0 will-change-auto',
                     actionPanelOpen
                         ? 'w-workflow-nodes-popover-menu-width'
                         : 'w-workflow-nodes-popover-component-menu-width'
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabs.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabs.tsx
index 278718dc99e..94bc4191514 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabs.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabs.tsx
@@ -58,7 +58,7 @@ const WorkflowNodesTabs = ({
                 </TabsList>
 
                 <div className="relative flex flex-1">
-                    <div className={twMerge('overflow-y-auto flex absolute w-full h-full')}>
+                    <div className={twMerge('absolute flex h-full w-full overflow-y-auto')}>
                         {!hideTriggerComponents && (
                             <TabsContent className="mt-0 w-full" value="triggers">
                                 <ul className="space-y-2" role="list">
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabsItem.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabsItem.tsx
index 43f9f79cddd..5aedb4402cf 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabsItem.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodesTabsItem.tsx
@@ -33,7 +33,7 @@ const WorkflowNodesTabsItem = ({draggable, handleClick, node, selected}: Workflo
     return (
         <li
             className={twMerge(
-                'flex h-16 cursor-pointer items-center border-2 border-transparent rounded-md bg-white px-2 py-1 hover:border-blue-200',
+                'flex h-16 cursor-pointer items-center rounded-md border-2 border-transparent bg-white px-2 py-1 hover:border-blue-200',
                 selected && 'border-blue-500 hover:bg-white'
             )}
             draggable={draggable}
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowTestConfigurationDialog.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowTestConfigurationDialog.tsx
index 120dc6b662c..63c04c6054d 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowTestConfigurationDialog.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowTestConfigurationDialog.tsx
@@ -114,7 +114,7 @@ const WorkflowTestConfigurationFormField = ({
                                             .map((connection) => (
                                                 <SelectItem key={connection.id} value={connection.id!.toString()}>
                                                     <div className="flex items-center">
-                                                        <span className="mr-1 ">{connection.name}</span>
+                                                        <span className="mr-1">{connection.name}</span>
 
                                                         <span className="text-xs text-gray-500">
                                                             {connection?.tags?.map((tag) => tag.name).join(', ')}
diff --git a/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx b/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx
index b737a49bfa5..46da4cc86a7 100644
--- a/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx
+++ b/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx
@@ -46,8 +46,8 @@ export default function WorkflowEdge({
                 >
                     <rect
                         className={twMerge(
-                            'react-flow__edge pointer-events-auto cursor-pointer fill-white stroke-gray-400 hover:fill-gray-200 hover:scale-110',
-                            isDropzoneActive && 'scale-150 fill-blue-100 stroke-blue-100 z-40'
+                            'react-flow__edge pointer-events-auto cursor-pointer fill-white stroke-gray-400 hover:scale-110 hover:fill-gray-200',
+                            isDropzoneActive && 'z-40 scale-150 fill-blue-100 stroke-blue-100'
                         )}
                         height={isDropzoneActive ? 72 : 24}
                         id={id}
diff --git a/client/src/pages/platform/workflow-editor/nodes/PlaceholderNode.tsx b/client/src/pages/platform/workflow-editor/nodes/PlaceholderNode.tsx
index 4d9110535fb..64cbec8c9d7 100644
--- a/client/src/pages/platform/workflow-editor/nodes/PlaceholderNode.tsx
+++ b/client/src/pages/platform/workflow-editor/nodes/PlaceholderNode.tsx
@@ -13,7 +13,7 @@ const PlaceholderNode = ({data, id}: NodeProps) => {
             <div
                 className={twMerge(
                     'mx-placeholder-node-position flex cursor-pointer items-center justify-center rounded-md text-lg text-gray-500 shadow-none hover:scale-110 hover:bg-gray-500 hover:text-white',
-                    isDropzoneActive ? 'scale-150 cursor-pointer bg-blue-100 size-16 mx-1.5' : 'size-7 bg-gray-300'
+                    isDropzoneActive ? 'mx-1.5 size-16 scale-150 cursor-pointer bg-blue-100' : 'size-7 bg-gray-300'
                 )}
                 onDragEnter={() => setDropzoneActive(true)}
                 onDragLeave={() => setDropzoneActive(false)}
diff --git a/client/src/pages/platform/workflow-executions/components/WorkflowTaskExecutionItem.tsx b/client/src/pages/platform/workflow-executions/components/WorkflowTaskExecutionItem.tsx
index 7839b7c8cd8..777cb9f2568 100644
--- a/client/src/pages/platform/workflow-executions/components/WorkflowTaskExecutionItem.tsx
+++ b/client/src/pages/platform/workflow-executions/components/WorkflowTaskExecutionItem.tsx
@@ -20,7 +20,7 @@ const WorkflowTaskExecutionItem = ({
         <li
             className={twMerge(
                 'flex w-full cursor-pointer items-center justify-between p-4 hover:bg-muted',
-                selected && 'font-semibold bg-muted/50'
+                selected && 'bg-muted/50 font-semibold'
             )}
             onClick={() => onClick && onClick()}
         >
diff --git a/client/src/pages/platform/workflow-executions/components/WorkflowTriggerExecutionItem.tsx b/client/src/pages/platform/workflow-executions/components/WorkflowTriggerExecutionItem.tsx
index f84ee62cbe7..397088c3d01 100644
--- a/client/src/pages/platform/workflow-executions/components/WorkflowTriggerExecutionItem.tsx
+++ b/client/src/pages/platform/workflow-executions/components/WorkflowTriggerExecutionItem.tsx
@@ -20,7 +20,7 @@ const WorkflowTriggerExecutionItem = ({
         <li
             className={twMerge(
                 'flex w-full cursor-pointer items-center justify-between p-4 hover:bg-muted',
-                selected && 'font-semibold bg-muted/50'
+                selected && 'bg-muted/50 font-semibold'
             )}
             onClick={() => onClick && onClick()}
         >
diff --git a/client/src/shared/layout/LayoutContainer.tsx b/client/src/shared/layout/LayoutContainer.tsx
index 4ead7d08b7b..d5ac851e848 100644
--- a/client/src/shared/layout/LayoutContainer.tsx
+++ b/client/src/shared/layout/LayoutContainer.tsx
@@ -87,7 +87,7 @@ const LayoutContainer = ({
             {leftSidebarOpen && (
                 <aside
                     className={twMerge(
-                        'hidden lg:flex lg:flex-col border-r border-r-border/50 bg-muted/50',
+                        'hidden border-r border-r-border/50 bg-muted/50 lg:flex lg:flex-col',
                         'lg:fixed lg:inset-y-0',
                         leftSidebarClass,
                         leftSidebarWidths[leftSidebarWidth][0]
diff --git a/client/src/shared/layout/LeftSidebarNav.tsx b/client/src/shared/layout/LeftSidebarNav.tsx
index 58929de7c4a..1999dcefb96 100644
--- a/client/src/shared/layout/LeftSidebarNav.tsx
+++ b/client/src/shared/layout/LeftSidebarNav.tsx
@@ -15,7 +15,7 @@ export interface LeftSidebarNavProps {
 }
 
 const LeftSidebarNav = ({body, className, title}: LeftSidebarNavProps) => (
-    <div className={twMerge('px-2 mb-4', className)}>
+    <div className={twMerge('mb-4 px-2', className)}>
         {body && (
             <div aria-label={title} className="flex space-x-2 lg:flex-col lg:space-x-0">
                 {title && <SidebarSubtitle title={title} />}