diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
index bf7b1a193f6..063a572e981 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
@@ -139,10 +139,9 @@ function onAskAssistantButtonClick() {
 				@click="focusPanelStore.toggleFocusPanel"
 			/>
 		</KeyboardShortcutTooltip>
-		<n8n-tooltip placement="left">
+		<n8n-tooltip v-if="assistantStore.canShowAssistantButtonsOnCanvas" placement="left">
 			<template #content> {{ i18n.baseText('aiAssistant.tooltip') }}</template>
 			<n8n-button
-				v-if="assistantStore.canShowAssistantButtonsOnCanvas"
 				type="tertiary"
 				size="large"
 				square
diff --git a/packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.vue
index 085cd515d78..109d7cc753f 100644
--- a/packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.vue
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.vue
@@ -153,9 +153,12 @@ const projectLocation = computed(() => {
 </script>
 <template>
 	<div :class="{ [$style.wrapper]: true, [$style['no-border']]: showBadgeBorder }" v-bind="$attrs">
-		<N8nTooltip :disabled="!badgeTooltip || numberOfMembersInHomeTeamProject !== 0" placement="top">
+		<N8nTooltip
+			v-if="badgeText"
+			:disabled="!badgeTooltip || numberOfMembersInHomeTeamProject !== 0"
+			placement="top"
+		>
 			<N8nBadge
-				v-if="badgeText"
 				:class="[$style.badge, $style.projectBadge]"
 				theme="tertiary"
 				data-test-id="card-badge"
@@ -172,13 +175,12 @@ const projectLocation = computed(() => {
 			</template>
 		</N8nTooltip>
 		<slot />
-		<N8nTooltip :disabled="!badgeTooltip || numberOfMembersInHomeTeamProject === 0" placement="top">
-			<div
-				v-if="numberOfMembersInHomeTeamProject"
-				:class="$style['count-badge']"
-				theme="tertiary"
-				bold
-			>
+		<N8nTooltip
+			v-if="numberOfMembersInHomeTeamProject"
+			:disabled="!badgeTooltip || numberOfMembersInHomeTeamProject === 0"
+			placement="top"
+		>
+			<div :class="$style['count-badge']" theme="tertiary" bold>
 				+{{ numberOfMembersInHomeTeamProject }}
 			</div>
 			<template #content>
diff --git a/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue
index edc4f7ebdcd..62b04f9324a 100644
--- a/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue
@@ -8,6 +8,7 @@ import type { ProjectListItem } from '@/types/projects.types';
 import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
+import { ElMenu } from 'element-plus';
 
 type Props = {
 	collapsed: boolean;
@@ -128,12 +129,12 @@ onBeforeMount(async () => {
 		>
 			<span>{{ locale.baseText('projects.menu.title') }}</span>
 			<N8nTooltip
+				v-if="projectsStore.canCreateProjects"
 				placement="right"
 				:disabled="projectsStore.hasPermissionToCreateProjects"
 				:content="locale.baseText('projects.create.permissionDenied')"
 			>
 				<N8nButton
-					v-if="projectsStore.canCreateProjects"
 					icon="plus"
 					text
 					data-test-id="project-plus-button"
@@ -162,12 +163,12 @@ onBeforeMount(async () => {
 			/>
 		</ElMenu>
 		<N8nTooltip
+			v-if="showAddFirstProject"
 			placement="right"
 			:disabled="projectsStore.hasPermissionToCreateProjects"
 			:content="locale.baseText('projects.create.permissionDenied')"
 		>
 			<N8nButton
-				v-if="showAddFirstProject"
 				:class="[
 					$style.addFirstProjectBtn,
 					{
diff --git a/packages/frontend/editor-ui/src/components/RunDataTable.vue b/packages/frontend/editor-ui/src/components/RunDataTable.vue
index 12759e29445..54faadb4356 100644
--- a/packages/frontend/editor-ui/src/components/RunDataTable.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataTable.vue
@@ -515,6 +515,7 @@ watch(
 						@mouseleave="onMouseLeaveCell"
 					>
 						<N8nTooltip
+							v-if="tableData.metadata.data[index1]"
 							:content="
 								i18n.baseText('runData.table.viewSubExecution', {
 									interpolate: {
@@ -526,7 +527,6 @@ watch(
 							:hide-after="0"
 						>
 							<N8nIconButton
-								v-if="tableData.metadata.data[index1]"
 								v-show="showExecutionLink(index1)"
 								element="a"
 								type="secondary"
@@ -681,6 +681,7 @@ watch(
 						@mouseleave="onMouseLeaveCell"
 					>
 						<N8nTooltip
+							v-if="tableData.metadata.data[index1]"
 							:content="
 								i18n.baseText('runData.table.viewSubExecution', {
 									interpolate: {
@@ -692,7 +693,6 @@ watch(
 							:hide-after="0"
 						>
 							<N8nIconButton
-								v-if="tableData.metadata.data[index1]"
 								v-show="showExecutionLink(index1)"
 								element="a"
 								type="secondary"
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
index 243dfc8b735..60aaaa3ec0a 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
@@ -118,12 +118,12 @@ function onFocusNode() {
 	>
 		<div :class="$style.canvasNodeToolbarItems">
 			<N8nTooltip
+				v-if="isExecuteNodeVisible"
 				placement="top"
 				:disabled="!isDisabled"
 				:content="i18n.baseText('ndv.execute.deactivated')"
 			>
 				<N8nIconButton
-					v-if="isExecuteNodeVisible"
 					data-test-id="execute-node-button"
 					type="tertiary"
 					text