diff --git a/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue
index 776752061f..4cf356ca69 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useCssModule, computed, useAttrs, watchEffect } from 'vue';
+import { computed, useAttrs, useCssModule, watchEffect } from 'vue';
 
 import type { ButtonProps } from '@n8n/design-system/types/button';
 
@@ -71,9 +71,8 @@ const classes = computed(() => {
 			<N8nSpinner v-if="loading" :size="iconSize" />
 			<N8nIcon v-else-if="icon" :icon="icon" :size="iconSize" />
 		</span>
-		<span v-if="label || $slots.default">
-			<slot>{{ label }}</slot>
-		</span>
+		<span v-if="label">{{ label }}</span>
+		<template v-else-if="$slots.default"><slot /></template>
 	</component>
 </template>
 
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
index 7b23d39ad8..471068c333 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
+++ b/packages/frontend/@n8n/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
@@ -1,8 +1,8 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button class="button button primary medium withIcon" aria-live="polite"><span class="icon"><n8n-icon-stub icon="plus-circle" size="medium" spin="false"></n8n-icon-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button class="button button primary medium withIcon" aria-live="polite"><span class="icon"><n8n-icon-stub icon="plus-circle" size="medium" spin="false"></n8n-icon-stub></span>Button</button>"`;
 
-exports[`components > N8nButton > props > loading > should render loading spinner 1`] = `"<button class="button button primary medium loading withIcon" disabled="" aria-busy="true" aria-live="polite"><span class="icon"><n8n-spinner-stub size="medium" type="dots"></n8n-spinner-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > props > loading > should render loading spinner 1`] = `"<button class="button button primary medium loading withIcon" disabled="" aria-busy="true" aria-live="polite"><span class="icon"><n8n-spinner-stub size="medium" type="dots"></n8n-spinner-stub></span>Button</button>"`;
 
 exports[`components > N8nButton > props > square > should render square button 1`] = `
 "<button class="button button primary medium square" aria-live="polite">
@@ -12,6 +12,6 @@ exports[`components > N8nButton > props > square > should render square button 1
 
 exports[`components > N8nButton > should render correctly 1`] = `
 "<button class="button button primary medium" aria-live="polite">
-  <!--v-if--><span>Button</span>
+  <!--v-if-->Button
 </button>"
 `;
diff --git a/packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
index 03b4ae066c..7af2ac1204 100644
--- a/packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
@@ -137,9 +137,7 @@ exports[`InputPanel > should render 1`] = `
           >
             <!--v-if-->
             <span>
-              
               Cancel
-              
             </span>
           </button>
           <button
@@ -149,9 +147,7 @@ exports[`InputPanel > should render 1`] = `
           >
             <!--v-if-->
             <span>
-              
               Save
-              
             </span>
           </button>
         </div>
diff --git a/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
index 8946dd78c1..cfc92932e0 100644
--- a/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
@@ -2820,9 +2820,7 @@ exports[`VirtualSchema.vue > renders schema with spaces and dots 1`] = `
               >
                 <!--v-if-->
                 <span>
-                  
                   Execute previous nodes
-                  
                 </span>
               </button>
               <!--teleport start-->
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
index 860476802c..bb734126df 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
@@ -21,7 +21,9 @@ exports[`CanvasControlButtons > should render correctly 1`] = `
   <!--teleport start-->
   <!--teleport end-->
   <!--v-if--><button class="button button tertiary large square iconButton el-tooltip__trigger el-tooltip__trigger iconButton el-tooltip__trigger el-tooltip__trigger" aria-live="polite" data-test-id="tidy-up-button">
-    <!--v-if--><span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M1.6.13c-.18-.17-.47-.18-.62 0L.56.57.14.98c-.2.15-.18.44 0 .62l3.63 3.6c.1.1.1.27 0 .37-.2.2-.53.52-.93.94-.56.57-.12 1.62.22 2.11.05.07.12.1.2.1.05-.01.1-.04.15-.08l5.23-5.22c.1-.1.1-.26-.02-.34-.5-.34-1.55-.78-2.12-.22-.42.4-.75.73-.94.93-.1.1-.27.1-.37 0L1.6.13ZM9.5 3.9c.07-.09.2-.1.3-.04l6.07 3.44c.15.08.18.29.05.4l-1.21 1.22a.26.26 0 0 1-.26.07l-2.18-.64a.26.26 0 0 0-.32.33l.76 2.02c.04.1.01.2-.06.27L7.7 15.92a.26.26 0 0 1-.41-.05L3.83 9.8a.26.26 0 0 1 .04-.3l5.62-5.6Z"></path></svg></span>
+    <!--v-if--><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+      <path fill="currentColor" d="M1.6.13c-.18-.17-.47-.18-.62 0L.56.57.14.98c-.2.15-.18.44 0 .62l3.63 3.6c.1.1.1.27 0 .37-.2.2-.53.52-.93.94-.56.57-.12 1.62.22 2.11.05.07.12.1.2.1.05-.01.1-.04.15-.08l5.23-5.22c.1-.1.1-.26-.02-.34-.5-.34-1.55-.78-2.12-.22-.42.4-.75.73-.94.93-.1.1-.27.1-.37 0L1.6.13ZM9.5 3.9c.07-.09.2-.1.3-.04l6.07 3.44c.15.08.18.29.05.4l-1.21 1.22a.26.26 0 0 1-.26.07l-2.18-.64a.26.26 0 0 0-.32.33l.76 2.02c.04.1.01.2-.06.27L7.7 15.92a.26.26 0 0 1-.41-.05L3.83 9.8a.26.26 0 0 1 .04-.3l5.62-5.6Z"></path>
+    </svg>
   </button>
   <!--teleport start-->
   <!--teleport end-->
diff --git a/packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.vue b/packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.vue
index dbf528d66f..59c3871667 100644
--- a/packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.vue
+++ b/packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.vue
@@ -166,11 +166,17 @@ onBeforeMount(() => {
 				square
 				:active="!!countSelectedFilterProps"
 				data-test-id="executions-filter-button"
+				:class="$style.filterButton"
 			>
 				<template v-if="!!countSelectedFilterProps" #default>
-					<n8n-badge theme="primary" class="mr-4xs" data-test-id="execution-filter-badge">{{
-						countSelectedFilterProps
-					}}</n8n-badge>
+					<n8n-badge
+						theme="primary"
+						class="mr-4xs"
+						data-test-id="execution-filter-badge"
+						:class="$style.filterBadge"
+					>
+						{{ countSelectedFilterProps }}
+					</n8n-badge>
 				</template>
 			</n8n-button>
 		</template>
@@ -401,6 +407,17 @@ onBeforeMount(() => {
 .tooltipIcon {
 	color: var(--color-text-light);
 }
+
+.filterButton {
+	position: relative;
+
+	.filterBadge {
+		position: absolute;
+		top: 0;
+		right: -4px;
+		transform: translate(50%, -50%);
+	}
+}
 </style>
 
 <style lang="scss" scoped>