diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index a14e6fd48..ee8c53683 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-tooltip v-bind="{ ...$props, ...$attrs }">
+	<el-tooltip v-bind="{ ...$props, ...$attrs }" popper-class="n8n-tooltip">
 		<slot />
 		<template #content>
 			<slot name="content">
diff --git a/packages/design-system/src/css/index.scss b/packages/design-system/src/css/index.scss
index 916ae11e0..ab3010938 100644
--- a/packages/design-system/src/css/index.scss
+++ b/packages/design-system/src/css/index.scss
@@ -30,7 +30,7 @@
 // @use "./time-select.scss";
 // @use "./time-picker.scss";
 @use './popover.scss';
-@use './tooltip.scss';
+//@use './tooltip.scss';
 @use './message-box.scss';
 // @use "./breadcrumb.scss";
 // @use "./breadcrumb-item.scss";
diff --git a/packages/design-system/src/css/popper.scss b/packages/design-system/src/css/popper.scss
index 2a63fe222..09fdbe558 100644
--- a/packages/design-system/src/css/popper.scss
+++ b/packages/design-system/src/css/popper.scss
@@ -150,3 +150,8 @@
 		}
 	}
 }
+
+.el-popper.n8n-tooltip {
+	max-width: 180px;
+	line-height: var(--font-line-height-regular) !important;
+}
diff --git a/packages/design-system/src/css/tooltip.scss b/packages/design-system/src/css/tooltip.scss
index 8cd12c3fc..eef6d4d17 100644
--- a/packages/design-system/src/css/tooltip.scss
+++ b/packages/design-system/src/css/tooltip.scss
@@ -2,6 +2,8 @@
 @use './common/var';
 
 @include mixins.b(tooltip) {
+	max-width: 200px;
+
 	&:focus:not(.focusing),
 	&:focus:hover {
 		outline-width: 0;
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index 62ad18cc1..ca1ae434b 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -1,5 +1,5 @@
 <template>
-	<span>
+	<div>
 		<n8n-tooltip placement="bottom" :disabled="!disabledHint">
 			<template #content>
 				<div>{{ disabledHint }}</div>
@@ -17,7 +17,7 @@
 				/>
 			</div>
 		</n8n-tooltip>
-	</span>
+	</div>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 08b810c67..29c23ced6 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -1010,6 +1010,7 @@ export default defineComponent({
 	}
 
 	.node-parameters-wrapper {
+		min-height: 100%;
 		overflow-y: auto;
 		padding: 0 20px 200px 20px;
 	}
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index facafb98c..1e5e13c22 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -224,7 +224,3 @@
 		}
 	}
 }
-
-.el-popper:not(.el-popover) {
-  max-width: 265px;
-}
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index a05ff89d8..25174fdc5 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -16,7 +16,7 @@
 				<font-awesome-icon icon="plus" size="lg" />
 			</button>
 			<template #content>
-				<p v-text="$locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting')" />
+				{{ $locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting') }}
 			</template>
 		</n8n-tooltip>
 		<p :class="$style.label" v-text="$locale.baseText('nodeView.canvasAddButton.addFirstStep')" />
@@ -81,10 +81,6 @@ const containerCssVars = computed(() => ({
 	}
 }
 
-:root .tooltip {
-	max-width: 180px;
-}
-
 .label {
 	width: max-content;
 	font-weight: var(--font-weight-bold);