From 171f5a458cce96923f5fb4b46ab19d262cf60478 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 27 Oct 2021 21:55:37 +0200
Subject: [PATCH 1/3] :zap: Update parameter inputs to be multi-line (#2299)

* introduce analytics

* add user survey backend

* add user survey backend

* set answers on survey submit

Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>

* change name to personalization

* lint

Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>

* N8n 2495 add personalization modal (#2280)

* update modals

* add onboarding modal

* implement questions

* introduce analytics

* simplify impl

* implement survey handling

* add personalized cateogry

* update modal behavior

* add thank you view

* handle empty cases

* rename modal

* standarize modal names

* update image, add tags to headings

* remove unused file

* remove unused interfaces

* clean up footer spacing

* introduce analytics

* refactor to fix bug

* update endpoint

* set min height

* update stories

* update naming from questions to survey

* remove spacing after core categories

* fix bug in logic

* sort nodes

* rename types

* merge with be

* rename userSurvey

* clean up rest api

* use constants for keys

* use survey keys

* clean up types

* move personalization to its own file

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>

* update parameter inputs to be multiline

* update spacing

* Survey new options (#2300)

* split up options

* fix quotes

* remove unused import

* refactor node credentials

* add user created workflow event (#2301)

* update multi params

* simplify env vars

* fix versionCli on FE

* update personalization env

* clean up node detail settings

* fix event User opened Credentials panel

* fix font sizes across modals

* clean up input spacing

* fix select modal spacing

* increase spacing

* fix input copy

* fix webhook, tab spacing, retry button

* fix button sizes

* fix button size

* add mini xlarge sizes

* fix webhook spacing

* fix nodes panel event

* fix workflow id in workflow execute event

* improve telemetry error logging

* fix config and stop process events

* add flush call on n8n stop

* ready for release

* fix input error highlighting

* revert change

* update toggle spacing

* fix delete positioning

* keep tooltip while focused

* set strict size

* increase left spacing

* fix sort icons

* remove unnessary margin

* clean unused functionality

* remove unnessary css

* remove duplicate tracking

* only show tooltip when hovering over label

* update credentials section

* use includes

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../components/N8nButton/Button.stories.js    |   8 +-
 .../src/components/N8nButton/Button.vue       |   9 +-
 .../src/components/N8nButton/index.d.ts       |   3 -
 .../src/components/N8nIcon/Icon.vue           |  44 ++---
 .../components/N8nIconButton/IconButton.vue   |  11 +-
 .../src/components/N8nIconButton/index.d.ts   |   3 -
 .../components/N8nInputLabel/InputLabel.vue   |  96 +++++++++--
 .../src/components/N8nText/Text.vue           |  27 ++-
 .../src/components/component.d.ts             |   2 +-
 packages/design-system/theme/src/button.scss  |  22 +++
 packages/design-system/theme/src/dialog.scss  |   2 -
 packages/design-system/theme/src/tabs.scss    |   2 +-
 packages/editor-ui/src/components/About.vue   |   1 +
 .../editor-ui/src/components/CodeEdit.vue     |  20 +--
 .../src/components/CollectionParameter.vue    |  10 +-
 .../editor-ui/src/components/CopyInput.vue    |   1 +
 .../CredentialEdit/CredentialEdit.vue         |   2 +-
 .../CredentialEdit/CredentialInfo.vue         |  14 +-
 .../src/components/CredentialsList.vue        |   4 +-
 .../editor-ui/src/components/DataDisplay.vue  |   2 +-
 .../src/components/ExecutionsList.vue         |  12 +-
 .../src/components/ExpressionEdit.vue         |   1 +
 .../components/FixedCollectionParameter.vue   |  68 ++++----
 .../src/components/MultipleParameter.vue      |  74 ++++-----
 .../src/components/NodeCredentials.vue        | 156 +++++++-----------
 .../editor-ui/src/components/NodeSettings.vue |  26 ++-
 .../editor-ui/src/components/NodeWebhooks.vue |  20 +--
 .../src/components/ParameterInput.vue         |  17 +-
 .../src/components/ParameterInputExpanded.vue |  14 +-
 .../src/components/ParameterInputFull.vue     |  94 +++--------
 .../src/components/ParameterInputList.vue     |  87 +++++-----
 packages/editor-ui/src/components/RunData.vue |  23 +--
 .../editor-ui/src/components/TextEdit.vue     |  20 +--
 .../src/components/WorkflowSettings.vue       |   1 +
 packages/editor-ui/src/components/helpers.ts  |   6 -
 35 files changed, 443 insertions(+), 459 deletions(-)

diff --git a/packages/design-system/src/components/N8nButton/Button.stories.js b/packages/design-system/src/components/N8nButton/Button.stories.js
index 504ea1af38..4958f85de5 100644
--- a/packages/design-system/src/components/N8nButton/Button.stories.js
+++ b/packages/design-system/src/components/N8nButton/Button.stories.js
@@ -18,7 +18,7 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['small', 'medium', 'large'],
+				options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 			},
 		},
 		loading: {
@@ -31,12 +31,6 @@ export default {
 				type: 'text',
 			},
 		},
-		iconSize: {
-			control: {
-				type: 'select',
-				options: ['small', 'medium', 'large'],
-			},
-		},
 		circle: {
 			control: {
 				type: 'boolean',
diff --git a/packages/design-system/src/components/N8nButton/Button.vue b/packages/design-system/src/components/N8nButton/Button.vue
index 2827b8f8b7..ff8d78b407 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/design-system/src/components/N8nButton/Button.vue
@@ -16,13 +16,13 @@
 			<component
 				:is="$options.components.N8nSpinner"
 				v-if="props.loading"
-				:size="props.iconSize"
+				:size="props.size"
 			/>
 			<component
 				:is="$options.components.N8nIcon"
 				v-else-if="props.icon"
 				:icon="props.icon"
-				:size="props.iconSize"
+				:size="props.size"
 			/>
 		</span>
 		<span v-if="props.label">{{ props.label }}</span>
@@ -58,7 +58,7 @@ export default {
 			type: String,
 			default: 'medium',
 			validator: (value: string): boolean =>
-				['small', 'medium', 'large'].indexOf(value) !== -1,
+				['mini', 'small', 'medium', 'large', 'xlarge'].indexOf(value) !== -1,
 		},
 		loading: {
 			type: Boolean,
@@ -71,9 +71,6 @@ export default {
 		icon: {
 			type: String,
 		},
-		iconSize: {
-			type: String,
-		},
 		round: {
 			type: Boolean,
 			default: true,
diff --git a/packages/design-system/src/components/N8nButton/index.d.ts b/packages/design-system/src/components/N8nButton/index.d.ts
index b70b0b8418..ad6c9e62b9 100644
--- a/packages/design-system/src/components/N8nButton/index.d.ts
+++ b/packages/design-system/src/components/N8nButton/index.d.ts
@@ -35,9 +35,6 @@ export declare class N8nButton extends N8nComponent {
 	/** Button icon, accepts an icon name of font awesome icon component */
 	icon: string;
 
-	/** Size of icon */
-	iconSize: N8nComponentSize;
-
 	/** Full width */
 	fullWidth: boolean;
 
diff --git a/packages/design-system/src/components/N8nIcon/Icon.vue b/packages/design-system/src/components/N8nIcon/Icon.vue
index 52457db0ac..8ffe65edec 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.vue
+++ b/packages/design-system/src/components/N8nIcon/Icon.vue
@@ -1,19 +1,27 @@
 <template functional>
 	<component
-		:is="$options.components.FontAwesomeIcon"
-		:class="$style[`_${props.size}`]"
-		:icon="props.icon"
-		:spin="props.spin"
-	/>
+		:is="$options.components.N8nText"
+		:size="props.size"
+		:compact="true"
+	>
+		<component
+			:is="$options.components.FontAwesomeIcon"
+			:icon="props.icon"
+			:spin="props.spin"
+			:class="$style[props.size]"
+		/>
+	</component>
 </template>
 
 <script lang="ts">
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import N8nText from '../N8nText';
 
 export default {
 	name: 'n8n-icon',
 	components: {
 		FontAwesomeIcon,
+		N8nText,
 	},
 	props: {
 		icon: {
@@ -23,9 +31,6 @@ export default {
 		size: {
 			type: String,
 			default: 'medium',
-			validator: function (value: string): boolean {
-				return ['small', 'medium', 'large'].indexOf(value) !== -1;
-			},
 		},
 		spin: {
 			type: Boolean,
@@ -35,22 +40,21 @@ export default {
 };
 </script>
 
+
 <style lang="scss" module>
-._small {
-	font-size: 0.85em;
-	height: 0.85em;
-	width: 0.85em !important;
+.xlarge {
+	width: var(--font-size-xl) !important;
 }
 
-._medium {
-	font-size: 0.95em;
-	height: 0.95em;
-	width: 0.95em !important;
+.large {
+	width: var(--font-size-m) !important;
 }
 
-._large {
-	font-size: 1.22em;
-	height: 1.22em;
-	width: 1.22em !important;
+.medium {
+	width: var(--font-size-s) !important;
+}
+
+.small {
+	width: var(--font-size-2xs) !important;
 }
 </style>
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.vue b/packages/design-system/src/components/N8nIconButton/IconButton.vue
index 6064ca4a53..513c829f00 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.vue
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.vue
@@ -2,11 +2,10 @@
 	<component :is="$options.components.N8nButton"
 		:type="props.type"
 		:disabled="props.disabled"
-		:size="props.size === 'xlarge' ? 'large' : props.size"
+		:size="props.size"
 		:loading="props.loading"
 		:title="props.title"
 		:icon="props.icon"
-		:iconSize="$options.iconSizeMap[props.size] || props.size"
 		:theme="props.theme"
 		@click="(e) => listeners.click && listeners.click(e)"
 		circle
@@ -16,11 +15,6 @@
 <script lang="ts">
 import N8nButton from '../N8nButton';
 
-const iconSizeMap = {
-	large: 'medium',
-	xlarge: 'large',
-};
-
 export default {
 	name: 'n8n-icon-button',
 	components: {
@@ -36,8 +30,6 @@ export default {
 		size: {
 			type: String,
 			default: 'medium',
-			validator: (value: string): boolean =>
-				['small', 'medium', 'large', 'xlarge'].indexOf(value) !== -1,
 		},
 		loading: {
 			type: Boolean,
@@ -55,6 +47,5 @@ export default {
 			type: String,
 		},
 	},
-	iconSizeMap,
 };
 </script>
diff --git a/packages/design-system/src/components/N8nIconButton/index.d.ts b/packages/design-system/src/components/N8nIconButton/index.d.ts
index d939a7e040..46ab70c572 100644
--- a/packages/design-system/src/components/N8nIconButton/index.d.ts
+++ b/packages/design-system/src/components/N8nIconButton/index.d.ts
@@ -12,9 +12,6 @@ export declare class N8nIconButton extends N8nComponent {
 	/** Button size */
 	size: N8nComponentSize | 'xlarge';
 
-	/** icon size */
-	iconSize: N8nComponentSize;
-
 	/** Determine whether it's loading */
 	loading: boolean;
 
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index a5213ca1aa..a3bc71899a 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,13 +1,13 @@
 <template functional>
-	<div :class="$style.inputLabel">
-		<div :class="props.label ? $style.label: ''">
-			<component v-if="props.label" :is="$options.components.N8nText" :bold="true">
+	<div :class="{[$style.inputLabelContainer]: !props.labelHoverableOnly}">
+		<div :class="{[$style.inputLabel]: props.labelHoverableOnly, [$options.methods.getLabelClass(props, $style)]: true}">
+			<component v-if="props.label" :is="$options.components.N8nText" :bold="props.bold" :size="props.size" :compact="!props.underline">
 				{{ props.label }}
-				<component :is="$options.components.N8nText" color="primary" :bold="true" v-if="props.required">*</component>
+				<component :is="$options.components.N8nText" color="primary" :bold="props.bold" :size="props.size" v-if="props.required">*</component>
 			</component>
-			<span :class="$style.infoIcon" v-if="props.tooltipText">
+			<span :class="[$style.infoIcon, props.showTooltip ? $style.showIcon: $style.hiddenIcon]" v-if="props.tooltipText">
 				<component :is="$options.components.N8nTooltip" placement="top" :popper-class="$style.tooltipPopper">
-					<component :is="$options.components.N8nIcon" icon="question-circle" />
+					<component :is="$options.components.N8nIcon" icon="question-circle" size="small" />
 					<div slot="content" v-html="$options.methods.addTargetBlank(props.tooltipText)"></div>
 				</component>
 			</span>
@@ -40,31 +40,97 @@ export default {
 		required: {
 			type: Boolean,
 		},
+		bold: {
+			type: Boolean,
+			default: true,
+		},
+		size: {
+			type: String,
+			default: 'medium',
+			validator: (value: string): boolean =>
+				['small', 'medium'].includes(value),
+		},
+		underline: {
+			type: Boolean,
+		},
+		showTooltip: {
+			type: Boolean,
+		},
+		labelHoverableOnly: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	methods: {
 		addTargetBlank,
+		getLabelClass(props: {label: string, size: string, underline: boolean}, $style: any) {
+			if (!props.label) {
+				return '';
+			}
+
+			if (props.underline) {
+				return $style[`label-${props.size}-underline`];
+			}
+
+			return $style[`label-${props.size}`];
+		},
 	},
 };
 </script>
 
 <style lang="scss" module>
-.inputLabel {
-	&:hover {
-		--info-icon-display: inline-block;
+.inputLabelContainer:hover {
+	> div > .infoIcon {
+		display: inline-block;
 	}
 }
 
-.label {
-	margin-bottom: var(--spacing-2xs);
-
-	* {
-		margin-right: var(--spacing-4xs);
+.inputLabel:hover {
+	> .infoIcon {
+		display: inline-block;
 	}
 }
 
 .infoIcon {
 	color: var(--color-text-light);
-	display: var(--info-icon-display, none);
+}
+
+.showIcon {
+	display: inline-block;
+}
+
+.hiddenIcon {
+	display: none;
+}
+
+.label {
+	* {
+		margin-right: var(--spacing-5xs);
+	}
+}
+
+.label-small {
+	composes: label;
+	margin-bottom: var(--spacing-4xs);
+}
+
+.label-medium {
+	composes: label;
+	margin-bottom: var(--spacing-2xs);
+}
+
+.underline {
+	border-bottom: var(--border-base);
+}
+
+.label-small-underline {
+	composes: label-small;
+	composes: underline;
+}
+
+.label-medium-underline {
+	composes: label-medium;
+	composes: underline;
 }
 
 .tooltipPopper {
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/design-system/src/components/N8nText/Text.vue
index 9103df7ad1..67cf0a4277 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/design-system/src/components/N8nText/Text.vue
@@ -16,7 +16,7 @@ export default Vue.extend({
 		size: {
 			type: String,
 			default: 'medium',
-			validator: (value: string): boolean => ['large', 'medium', 'small'].includes(value),
+			validator: (value: string): boolean => ['mini', 'small', 'medium', 'large', 'xlarge'].includes(value),
 		},
 		color: {
 			type: String,
@@ -26,16 +26,23 @@ export default Vue.extend({
 			type: String,
 			validator: (value: string): boolean => ['right', 'left', 'center'].includes(value),
 		},
+		compact: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	methods: {
 		getClass(props: {size: string, bold: boolean}) {
 			return `body-${props.size}${props.bold ? '-bold' : '-regular'}`;
 		},
-		getStyles(props: {color: string, align: string}) {
+		getStyles(props: {color: string, align: string, compact: false}) {
 			const styles = {} as any;
 			if (props.color) {
 				styles.color = `var(--color-${props.color})`;
 			}
+			if (props.compact) {
+				styles['line-height'] = 1;
+			}
 			if (props.align) {
 				styles['text-align'] = props.align;
 			}
@@ -54,6 +61,22 @@ export default Vue.extend({
 	font-weight: var(--font-weight-regular);
 }
 
+.body-xlarge {
+	font-size: var(--font-size-xl);
+	line-height: var(--font-line-height-xloose);
+}
+
+.body-xlarge-regular {
+	composes: regular;
+	composes: body-xlarge;
+}
+
+.body-xlarge-bold {
+	composes: bold;
+	composes: body-xlarge;
+}
+
+
 .body-large {
 	font-size: var(--font-size-m);
 	line-height: var(--font-line-height-xloose);
diff --git a/packages/design-system/src/components/component.d.ts b/packages/design-system/src/components/component.d.ts
index 006d5a85ec..f818aa1423 100644
--- a/packages/design-system/src/components/component.d.ts
+++ b/packages/design-system/src/components/component.d.ts
@@ -7,4 +7,4 @@ export declare class N8nComponent extends Vue {
 }
 
 /** Component size definition for button, input, etc */
-export type N8nComponentSize = 'large' | 'medium' | 'small';
+export type N8nComponentSize = 'xlarge' | 'large' | 'medium' | 'small' | 'mini';
diff --git a/packages/design-system/theme/src/button.scss b/packages/design-system/theme/src/button.scss
index c16e720b5d..9fabeb5e63 100644
--- a/packages/design-system/theme/src/button.scss
+++ b/packages/design-system/theme/src/button.scss
@@ -83,6 +83,17 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0.35);
 		--button-border-radius: 50%;
 	}
 
+	@include mixins.m(mini) {
+		--button-padding-vertical: var(--spacing-4xs);
+		--button-padding-horizontal: var(--spacing-2xs);
+		--button-font-size: var(--font-size-2xs);
+
+		@include mixins.when(circle) {
+			--button-padding-vertical: var(--spacing-4xs);
+			--button-padding-horizontal: var(--spacing-4xs);
+		}
+	}
+
 	@include mixins.m(small) {
 		--button-padding-vertical: var(--spacing-3xs);
 		--button-padding-horizontal: var(--spacing-xs);
@@ -104,4 +115,15 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0.35);
 			--button-padding-horizontal: var(--spacing-2xs);
 		}
 	}
+
+	@include mixins.m(xlarge) {
+		--button-padding-vertical: var(--spacing-xs);
+		--button-padding-horizontal: var(--spacing-s);
+		--button-font-size: var(--font-size-m);
+
+		@include mixins.when(circle) {
+			--button-padding-vertical: var(--spacing-xs);
+			--button-padding-horizontal: var(--spacing-xs);
+		}
+	}
 }
diff --git a/packages/design-system/theme/src/dialog.scss b/packages/design-system/theme/src/dialog.scss
index 3d9cb0144e..c8296cb0ab 100644
--- a/packages/design-system/theme/src/dialog.scss
+++ b/packages/design-system/theme/src/dialog.scss
@@ -68,8 +68,6 @@
 	@include mixins.e(body) {
 		padding: var.$dialog-padding-primary;
 		color: var(--color-text-base);
-		font-size: var.$dialog-content-font-size;
-		word-break: break-all;
 	}
 
 	@include mixins.e(footer) {
diff --git a/packages/design-system/theme/src/tabs.scss b/packages/design-system/theme/src/tabs.scss
index 47adcd305b..c9adeac71d 100644
--- a/packages/design-system/theme/src/tabs.scss
+++ b/packages/design-system/theme/src/tabs.scss
@@ -5,7 +5,7 @@
 	@include mixins.e(header) {
 		padding: 0;
 		position: relative;
-		margin: 0 0 15px;
+		margin: 0;
 	}
 	@include mixins.e(active-bar) {
 		position: absolute;
diff --git a/packages/editor-ui/src/components/About.vue b/packages/editor-ui/src/components/About.vue
index a9bb49f323..b2c079dbf2 100644
--- a/packages/editor-ui/src/components/About.vue
+++ b/packages/editor-ui/src/components/About.vue
@@ -67,6 +67,7 @@ export default mixins(
 
 <style scoped lang="scss">
 .n8n-about {
+	font-size: var(--font-size-s);
 	.el-row {
 		padding: 0.25em 0;
 	}
diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index fb1c02521d..8aa76f7b62 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -1,13 +1,12 @@
 <template>
 	<div v-if="dialogVisible">
 		<el-dialog :visible="dialogVisible" append-to-body :close-on-click-modal="false" width="80%" :title="`Edit ${parameter.displayName}`" :before-close="closeDialog">
-			<div class="text-editor-wrapper ignore-key-press">
-				<div class="editor-description">
-					{{parameter.displayName}}:
-				</div>
-				<div class="text-editor" @keydown.stop>
-					<prism-editor :lineNumbers="true" :code="value" :readonly="isReadOnly" @change="valueChanged" language="js"></prism-editor>
-				</div>
+			<div class="ignore-key-press">
+				<n8n-input-label :label="parameter.displayName">
+					<div :class="$style.editor" @keydown.stop>
+						<prism-editor :lineNumbers="true" :code="value" :readonly="isReadOnly" @change="valueChanged" language="js"></prism-editor>
+					</div>
+				</n8n-input-label>
 			</div>
 		</el-dialog>
 	</div>
@@ -53,9 +52,8 @@ export default mixins(
 	});
 </script>
 
-<style scoped>
-.editor-description {
-	font-weight: bold;
-	padding: 0 0 0.5em 0.2em;;
+<style lang="scss" module>
+.editor {
+	font-size: var(--font-size-s);
 }
 </style>
diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/editor-ui/src/components/CollectionParameter.vue
index a03e62365c..ef958a36f3 100644
--- a/packages/editor-ui/src/components/CollectionParameter.vue
+++ b/packages/editor-ui/src/components/CollectionParameter.vue
@@ -2,10 +2,10 @@
 	<div @keydown.stop class="collection-parameter">
 		<div class="collection-parameter-wrapper">
 			<div v-if="getProperties.length === 0" class="no-items-exist">
-				Currently no properties exist
+				<n8n-text size="small">Currently no properties exist</n8n-text>
 			</div>
 
-			<parameter-input-list :parameters="getProperties" :nodeValues="nodeValues" :path="path" :hideDelete="hideDelete" @valueChanged="valueChanged" />
+			<parameter-input-list :parameters="getProperties" :nodeValues="nodeValues" :path="path" :hideDelete="hideDelete" :indent="true" @valueChanged="valueChanged" />
 
 			<div v-if="parameterOptions.length > 0 && !isReadOnly" class="param-options">
 				<n8n-button
@@ -184,14 +184,14 @@ export default mixins(
 <style lang="scss">
 
 .collection-parameter {
-	padding-left: 2em;
+	padding-left: var(--spacing-s);
 
 	.param-options {
-		padding-top: 0.5em;
+		margin-top: var(--spacing-xs);
 	}
 
 	.no-items-exist {
-		margin: 0.8em 0 0.4em 0;
+		margin: var(--spacing-xs) 0;
 	}
 	.option {
 		position: relative;
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/editor-ui/src/components/CopyInput.vue
index 64866c5e6c..5679fef49c 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -53,6 +53,7 @@ export default mixins(copyPaste, showMessage).extend({
 	span {
 		font-family: Monaco, Consolas;
 		line-height: 1.5;
+		font-size: var(--font-size-s);
 	}
 
 	padding: var(--spacing-xs);
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index a14938a831..ca6c8eb59c 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -24,7 +24,7 @@
 				<div :class="$style.credActions">
 					<n8n-icon-button
 						v-if="currentCredential"
-						size="medium"
+						size="small"
 						title="Delete"
 						icon="trash"
 						type="text"
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
index d42212cc30..4f911a292e 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
@@ -2,7 +2,7 @@
 	<div :class="$style.container">
 		<el-row>
 			<el-col :span="8" :class="$style.accessLabel">
-				<span>Allow use by</span>
+				<n8n-text :compact="true" :bold="true">Allow use by</n8n-text>
 			</el-col>
 			<el-col :span="16">
 				<div
@@ -20,26 +20,26 @@
 		</el-row>
 		<el-row v-if="currentCredential">
 			<el-col :span="8" :class="$style.label">
-				<span>Created</span>
+				<n8n-text :compact="true" :bold="true">Created</n8n-text>
 			</el-col>
 			<el-col :span="16" :class="$style.valueLabel">
-				<TimeAgo :date="currentCredential.createdAt" :capitalize="true" />
+				<n8n-text :compact="true"><TimeAgo :date="currentCredential.createdAt" :capitalize="true" /></n8n-text>
 			</el-col>
 		</el-row>
 		<el-row v-if="currentCredential">
 			<el-col :span="8" :class="$style.label">
-				<span>Last modified</span>
+				<n8n-text :compact="true" :bold="true">Last modified</n8n-text>
 			</el-col>
 			<el-col :span="16" :class="$style.valueLabel">
-				<TimeAgo :date="currentCredential.updatedAt" :capitalize="true" />
+				<n8n-text :compact="true"><TimeAgo :date="currentCredential.updatedAt" :capitalize="true" /></n8n-text>
 			</el-col>
 		</el-row>
 		<el-row v-if="currentCredential">
 			<el-col :span="8" :class="$style.label">
-				<span>ID</span>
+				<n8n-text :compact="true" :bold="true">ID</n8n-text>
 			</el-col>
 			<el-col :span="16" :class="$style.valueLabel">
-				<span>{{currentCredential.id}}</span>
+				<n8n-text :compact="true">{{currentCredential.id}}</n8n-text>
 			</el-col>
 		</el-row>
 	</div>
diff --git a/packages/editor-ui/src/components/CredentialsList.vue b/packages/editor-ui/src/components/CredentialsList.vue
index fc29d90a7d..baced3d27e 100644
--- a/packages/editor-ui/src/components/CredentialsList.vue
+++ b/packages/editor-ui/src/components/CredentialsList.vue
@@ -26,8 +26,8 @@
 					width="120">
 					<template slot-scope="scope">
 						<div class="cred-operations">
-							<n8n-icon-button title="Edit Credentials" @click.stop="editCredential(scope.row)" icon="pen" />
-							<n8n-icon-button title="Delete Credentials" @click.stop="deleteCredential(scope.row)" icon="trash" />
+							<n8n-icon-button title="Edit Credentials" @click.stop="editCredential(scope.row)" size="small" icon="pen" />
+							<n8n-icon-button title="Delete Credentials" @click.stop="deleteCredential(scope.row)" size="small" icon="trash" />
 						</div>
 					</template>
 				</el-table-column>
diff --git a/packages/editor-ui/src/components/DataDisplay.vue b/packages/editor-ui/src/components/DataDisplay.vue
index 2b9a38b7d0..661894bbc3 100644
--- a/packages/editor-ui/src/components/DataDisplay.vue
+++ b/packages/editor-ui/src/components/DataDisplay.vue
@@ -3,7 +3,7 @@
 		:visible="!!node"
 		:before-close="close"
 		:custom-class="`classic data-display-wrapper`"
-		width="80%"
+		width="85%"
 		append-to-body
 		@opened="showDocumentHelp = true"
 	>
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index cbab09095e..86aa77f7b5 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -35,7 +35,7 @@
 			<div class="selection-options">
 				<span v-if="checkAll === true || isIndeterminate === true">
 					Selected: {{numSelected}} / <span v-if="finishedExecutionsCountEstimated === true">~</span>{{finishedExecutionsCount}}
-					<n8n-icon-button title="Delete Selected" icon="trash" size="small" @click="handleDeleteSelected" />
+					<n8n-icon-button title="Delete Selected" icon="trash" size="mini" @click="handleDeleteSelected" />
 				</span>
 			</div>
 
@@ -101,7 +101,7 @@
 									 v-if="scope.row.stoppedAt !== undefined && !scope.row.finished && scope.row.retryOf === undefined && scope.row.retrySuccessId === undefined && !scope.row.waitTill"
 									 type="light"
 									 :theme="scope.row.stoppedAt === null ? 'warning': 'danger'"
-									 size="small"
+									 size="mini"
 									 title="Retry execution"
 									 icon="redo"
 								/>
@@ -134,10 +134,10 @@
 					<template slot-scope="scope">
 						<div class="actions-container">
 							<span v-if="scope.row.stoppedAt === undefined || scope.row.waitTill">
-								<n8n-icon-button icon="stop" title="Stop Execution" @click.stop="stopExecution(scope.row.id)" :loading="stoppingExecutions.includes(scope.row.id)" />
+								<n8n-icon-button icon="stop" size="small" title="Stop Execution" @click.stop="stopExecution(scope.row.id)" :loading="stoppingExecutions.includes(scope.row.id)" />
 							</span>
 							<span v-if="scope.row.stoppedAt !== undefined && scope.row.id" >
-								<n8n-icon-button icon="folder-open" title="Open Past Execution" @click.stop="displayExecution(scope.row)" />
+								<n8n-icon-button icon="folder-open" size="small" title="Open Past Execution" @click.stop="displayExecution(scope.row)" />
 							</span>
 						</div>
 					</template>
@@ -711,12 +711,10 @@ export default mixins(
 	position: relative;
 	display: inline-block;
 	padding: 0 10px;
-	height: 22.6px;
 	line-height: 22.6px;
 	border-radius: 15px;
 	text-align: center;
-	font-weight: 400;
-	font-size: 12px;
+	font-size: var(--font-size-s);
 
 	&.error {
 		background-color: var(--color-danger-tint-1);
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index 2da401fe82..df96becad0 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -143,6 +143,7 @@ export default mixins(
 
 	.el-dialog__body {
 		padding: 0;
+		font-size: var(--font-size-s);
 	}
 
 	.right-side {
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 50eaf887bf..2f334ef830 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -1,35 +1,39 @@
 <template>
 	<div @keydown.stop class="fixed-collection-parameter">
 		<div v-if="getProperties.length === 0" class="no-items-exist">
-			Currently no items exist
+			<n8n-text size="small">Currently no items exist</n8n-text>
 		</div>
 
 		<div v-for="property in getProperties" :key="property.name" class="fixed-collection-parameter-property">
-			<div v-if="property.displayName === '' || parameter.options.length === 1"></div>
-			<div v-else class="parameter-name" :title="property.displayName">{{property.displayName}}:</div>
-
-			<div v-if="multipleValues === true">
-				<div v-for="(value, index) in values[property.name]" :key="property.name + index" class="parameter-item">
+			<n8n-input-label
+				:label="property.displayName === '' || parameter.options.length === 1 ? '' : property.displayName"
+				:underline="true"
+				:labelHoverableOnly="true"
+				size="small"
+			>
+				<div v-if="multipleValues === true">
+					<div v-for="(value, index) in values[property.name]" :key="property.name + index" class="parameter-item">
+						<div class="parameter-item-wrapper">
+							<div class="delete-option" v-if="!isReadOnly">
+								<font-awesome-icon icon="trash" class="reset-icon clickable" title="Delete Item" @click="deleteOption(property.name, index)" />
+								<div v-if="sortable" class="sort-icon">
+									<font-awesome-icon v-if="index !== 0" icon="angle-up" class="clickable" title="Move up" @click="moveOptionUp(property.name, index)" />
+									<font-awesome-icon v-if="index !== (values[property.name].length -1)" icon="angle-down" class="clickable" title="Move down" @click="moveOptionDown(property.name, index)" />
+								</div>
+							</div>
+							<parameter-input-list :parameters="property.values" :nodeValues="nodeValues" :path="getPropertyPath(property.name, index)" :hideDelete="true" @valueChanged="valueChanged" />
+						</div>
+					</div>
+				</div>
+				<div v-else class="parameter-item">
 					<div class="parameter-item-wrapper">
 						<div class="delete-option" v-if="!isReadOnly">
-							<font-awesome-icon icon="trash" class="reset-icon clickable" title="Delete Item" @click="deleteOption(property.name, index)" />
-							<div v-if="sortable" class="sort-icon">
-								<font-awesome-icon v-if="index !== 0" icon="angle-up" class="clickable" title="Move up" @click="moveOptionUp(property.name, index)" />
-								<font-awesome-icon v-if="index !== (values[property.name].length -1)" icon="angle-down" class="clickable" title="Move down" @click="moveOptionDown(property.name, index)" />
-							</div>
+							<font-awesome-icon icon="trash" class="reset-icon clickable" title="Delete Item" @click="deleteOption(property.name)" />
 						</div>
-						<parameter-input-list :parameters="property.values" :nodeValues="nodeValues" :path="getPropertyPath(property.name, index)" :hideDelete="true" @valueChanged="valueChanged" />
+						<parameter-input-list :parameters="property.values" :nodeValues="nodeValues" :path="getPropertyPath(property.name)" class="parameter-item" @valueChanged="valueChanged" :hideDelete="true" />
 					</div>
 				</div>
-			</div>
-			<div v-else class="parameter-item">
-				<div class="parameter-item-wrapper">
-					<div class="delete-option" v-if="!isReadOnly">
-						<font-awesome-icon icon="trash" class="reset-icon clickable" title="Delete Item" @click="deleteOption(property.name)" />
-					</div>
-					<parameter-input-list :parameters="property.values" :nodeValues="nodeValues" :path="getPropertyPath(property.name)" class="parameter-item" @valueChanged="valueChanged" :hideDelete="true" />
-				</div>
-			</div>
+			</n8n-input-label>
 		</div>
 
 		<div v-if="parameterOptions.length > 0 && !isReadOnly">
@@ -221,16 +225,11 @@ export default mixins(genericHelpers)
 <style scoped lang="scss">
 
 .fixed-collection-parameter {
-	padding: 0 0 0 1em;
+	padding-left: var(--spacing-s);
 }
 
 .fixed-collection-parameter-property {
-	margin: 0.5em 0;
-	padding: 0.5em 0;
-
-	.parameter-name {
-		border-bottom: 1px solid #999;
-	}
+	margin: var(--spacing-xs) 0;
 }
 
 .delete-option {
@@ -244,28 +243,33 @@ export default mixins(genericHelpers)
 	height: 100%;
 }
 
-.parameter-item-wrapper:hover > .delete-option {
+.parameter-item:hover > .parameter-item-wrapper > .delete-option {
 	display: block;
 }
 
 .parameter-item {
 	position: relative;
 	padding: 0 0 0 1em;
-	margin: 0.6em 0 0.5em 0.1em;
 
 	+ .parameter-item {
 		.parameter-item-wrapper {
-			padding-top: 0.5em;
 			border-top: 1px dashed #999;
+
+			.delete-option {
+				top: 14px;
+			}
 		}
 	}
 }
 
 .no-items-exist {
-	margin: 0.8em 0;
+	margin: var(--spacing-xs) 0;
 }
 
 .sort-icon {
+	display: flex;
+	flex-direction: column;
+	margin-left: 1px;
 	margin-top: .5em;
 }
 </style>
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index 8e31c6965e..455800e5ff 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/editor-ui/src/components/MultipleParameter.vue
@@ -1,37 +1,37 @@
 <template>
 	<div @keydown.stop class="duplicate-parameter">
+		<n8n-input-label
+			:label="parameter.displayName"
+			:tooltipText="parameter.description"
+			:underline="true"
+			:labelHoverableOnly="true"
+			size="small"
+		>
 
-		<div class="parameter-name">
-			{{parameter.displayName}}:
-			<n8n-tooltip v-if="parameter.description" class="parameter-info" placement="top" >
-				<div slot="content" v-html="addTargetBlank(parameter.description)"></div>
-				<font-awesome-icon icon="question-circle" />
-			</n8n-tooltip>
-		</div>
-
-		<div v-for="(value, index) in values" :key="index" class="duplicate-parameter-item" :class="parameter.type">
-			<div class="delete-item clickable" v-if="!isReadOnly">
-				<font-awesome-icon icon="trash" title="Delete Item" @click="deleteItem(index)" />
-				<div v-if="sortable">
-					<font-awesome-icon v-if="index !== 0" icon="angle-up" class="clickable" title="Move up" @click="moveOptionUp(index)" />
-					<font-awesome-icon v-if="index !== (values.length -1)" icon="angle-down" class="clickable" title="Move down" @click="moveOptionDown(index)" />
+			<div v-for="(value, index) in values" :key="index" class="duplicate-parameter-item" :class="parameter.type">
+				<div class="delete-item clickable" v-if="!isReadOnly">
+					<font-awesome-icon icon="trash" title="Delete Item" @click="deleteItem(index)" />
+					<div v-if="sortable">
+						<font-awesome-icon v-if="index !== 0" icon="angle-up" class="clickable" title="Move up" @click="moveOptionUp(index)" />
+						<font-awesome-icon v-if="index !== (values.length -1)" icon="angle-down" class="clickable" title="Move down" @click="moveOptionDown(index)" />
+					</div>
+				</div>
+				<div v-if="parameter.type === 'collection'">
+					<collection-parameter :parameter="parameter" :values="value" :nodeValues="nodeValues" :path="getPath(index)" :hideDelete="hideDelete" @valueChanged="valueChanged" />
+				</div>
+				<div v-else>
+					<parameter-input class="duplicate-parameter-input-item" :parameter="parameter" :value="value" :displayOptions="true" :path="getPath(index)" @valueChanged="valueChanged" inputSize="small" :isReadOnly="isReadOnly" />
 				</div>
 			</div>
-			<div v-if="parameter.type === 'collection'">
-				<collection-parameter :parameter="parameter" :values="value" :nodeValues="nodeValues" :path="getPath(index)" :hideDelete="hideDelete" @valueChanged="valueChanged" />
-			</div>
-			<div v-else>
-				<parameter-input class="duplicate-parameter-input-item" :parameter="parameter" :value="value" :displayOptions="true" :path="getPath(index)" @valueChanged="valueChanged" inputSize="small" :isReadOnly="isReadOnly" />
-			</div>
-		</div>
 
-		<div class="add-item-wrapper">
-			<div v-if="values && Object.keys(values).length === 0 || isReadOnly" class="no-items-exist">
-				Currently no items exist
+			<div class="add-item-wrapper">
+				<div v-if="values && Object.keys(values).length === 0 || isReadOnly" class="no-items-exist">
+					<n8n-text size="small">Currently no items exist</n8n-text>
+				</div>
+				<n8n-button v-if="!isReadOnly" fullWidth @click="addItem()" :label="addButtonText" />
 			</div>
-			<n8n-button v-if="!isReadOnly" fullWidth @click="addItem()" :label="addButtonText" />
-		</div>
 
+		</n8n-input-label>
 	</div>
 </template>
 
@@ -48,7 +48,6 @@ import { get } from 'lodash';
 import { genericHelpers } from '@/components/mixins/genericHelpers';
 
 import mixins from 'vue-typed-mixins';
-import { addTargetBlank } from './helpers';
 
 export default mixins(genericHelpers)
 	.extend({
@@ -75,7 +74,6 @@ export default mixins(genericHelpers)
 			},
 		},
 		methods: {
-			addTargetBlank,
 			addItem () {
 				const name = this.getPath();
 				let currentValue = get(this.nodeValues, name);
@@ -134,11 +132,7 @@ export default mixins(genericHelpers)
 <style scoped lang="scss">
 
 .duplicate-parameter-item ~.add-item-wrapper {
-	margin: 1.5em 0 0em 0em;
-}
-
-.add-item-wrapper {
-	margin: 0.5em 0 0em 2em;
+	margin-top: var(--spacing-xs);
 }
 
 .delete-item {
@@ -149,23 +143,15 @@ export default mixins(genericHelpers)
 	z-index: 999;
 	color: #f56c6c;
 	width: 15px;
+	font-size: var(--font-size-2xs);
 
 	:hover {
 		color: #ff0000;
 	}
 }
 
-.duplicate-parameter {
-	margin-top: 0.5em;
-	.parameter-name {
-		border-bottom: 1px solid #999;
-	}
-}
-
 ::v-deep .duplicate-parameter-item {
 	position: relative;
-	margin-top: 0.5em;
-	padding-top: 0.5em;
 
 	.multi > .delete-item{
 		top: 0.1em;
@@ -179,12 +165,12 @@ export default mixins(genericHelpers)
 ::v-deep .duplicate-parameter-item + .duplicate-parameter-item {
 	.collection-parameter-wrapper {
 		border-top: 1px dashed #999;
-		padding-top: 0.5em;
+		margin-top: var(--spacing-xs);
 	}
 }
 
 .no-items-exist {
-	margin: 0 0 1em 0;
+	margin: var(--spacing-xs) 0;
 }
 </style>
 
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 60d0532d66..cc2d63c2c2 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -1,51 +1,46 @@
 <template>
-	<div v-if="credentialTypesNodeDescriptionDisplayed.length" class="node-credentials">
-		<div class="headline">
-			Credentials
-		</div>
+	<div v-if="credentialTypesNodeDescriptionDisplayed.length" :class="$style.container">
+		<div v-for="credentialTypeDescription in credentialTypesNodeDescriptionDisplayed" :key="credentialTypeDescription.name">
+			<n8n-input-label
+				:label="`Credential for ${credentialTypeNames[credentialTypeDescription.name]}`"
+				:bold="false"
+				size="small"
 
-		<div v-for="credentialTypeDescription in credentialTypesNodeDescriptionDisplayed" :key="credentialTypeDescription.name" class="credential-data">
-			<el-row class="credential-parameter-wrapper">
-				<el-col :span="10" class="parameter-name">
-					{{credentialTypeNames[credentialTypeDescription.name]}}:
-				</el-col>
+				:set="issues = getIssues(credentialTypeDescription.name)"
+			>
+				<div v-if="isReadOnly">
+					<n8n-input disabled :value="selected && selected[credentialTypeDescription.name] && selected[credentialTypeDescription.name].name" size="small" />
+				</div>
 
-				<el-col v-if="!isReadOnly" :span="12" class="parameter-value" :class="getIssues(credentialTypeDescription.name).length?'has-issues':''">
-					<div :style="credentialInputWrapperStyle(credentialTypeDescription.name)">
-						<n8n-select :value="getSelectedId(credentialTypeDescription.name)" @change="(value) => onCredentialSelected(credentialTypeDescription.name, value)" placeholder="Select Credential" size="small">
-							<n8n-option
-								v-for="(item) in credentialOptions[credentialTypeDescription.name]"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id">
-							</n8n-option>
-							<n8n-option
-								:key="NEW_CREDENTIALS_TEXT"
-								:value="NEW_CREDENTIALS_TEXT"
-								:label="NEW_CREDENTIALS_TEXT"
-							>
-							</n8n-option>
-						</n8n-select>
-					</div>
+				<div :class="issues.length ? $style.hasIssues : $style.input" v-else >
+					<n8n-select :value="getSelectedId(credentialTypeDescription.name)" @change="(value) => onCredentialSelected(credentialTypeDescription.name, value)" placeholder="Select Credential" size="small">
+						<n8n-option
+							v-for="(item) in credentialOptions[credentialTypeDescription.name]"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id">
+						</n8n-option>
+						<n8n-option
+							:key="NEW_CREDENTIALS_TEXT"
+							:value="NEW_CREDENTIALS_TEXT"
+							:label="NEW_CREDENTIALS_TEXT"
+						>
+						</n8n-option>
+					</n8n-select>
 
-					<div class="credential-issues">
+					<div :class="$style.warning" v-if="issues.length">
 						<n8n-tooltip placement="top" >
-							<div slot="content" v-html="'Issues:<br />&nbsp;&nbsp;- ' + getIssues(credentialTypeDescription.name).join('<br />&nbsp;&nbsp;- ')"></div>
+							<div slot="content" v-html="'Issues:<br />&nbsp;&nbsp;- ' + issues.join('<br />&nbsp;&nbsp;- ')"></div>
 							<font-awesome-icon icon="exclamation-triangle" />
 						</n8n-tooltip>
 					</div>
-				</el-col>
-				<el-col v-if="!isReadOnly" :span="2" class="parameter-value credential-action">
-					<font-awesome-icon v-if="isCredentialExisting(credentialTypeDescription.name)" icon="pen" @click="editCredential(credentialTypeDescription.name)" class="update-credentials clickable" title="Update Credentials" />
-				</el-col>
 
-				<el-col v-if="isReadOnly" :span="14" class="readonly-container" >
-					<n8n-input disabled :value="selected && selected[credentialTypeDescription.name] && selected[credentialTypeDescription.name].name" size="small" />
-				</el-col>
-
-			</el-row>
+					<div :class="$style.edit" v-if="selected[credentialTypeDescription.name] && isCredentialExisting(credentialTypeDescription.name)">
+						<font-awesome-icon icon="pen" @click="editCredential(credentialTypeDescription.name)" class="clickable" title="Update Credentials" />
+					</div>
+				</div>
+			</n8n-input-label>
 		</div>
-
 	</div>
 </template>
 
@@ -285,62 +280,39 @@ export default mixins(
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" module>
+.container {
+	margin: var(--spacing-xs) 0;
 
-.node-credentials {
-	padding-bottom: 1em;
-	margin: 0.5em;
-	border-bottom: 1px solid #ccc;
-
-	.credential-issues {
-		display: none;
-		width: 20px;
-		text-align: right;
-		float: right;
-		color: #ff8080;
-		font-size: 1.2em;
-		margin-top: 3px;
-	}
-
-	.credential-data + .credential-data {
-		margin-top: 1em;
-	}
-
-	.has-issues {
-		.credential-issues {
-			display: inline-block;
-		}
-	}
-
-	.headline {
-		font-weight: bold;
-		margin-bottom: 0.7em;
-	}
-
-	.credential-parameter-wrapper {
-		display: flex;
-		align-items: center;
-	}
-
-	.parameter-name {
-		font-weight: 400;
-	}
-
-	.parameter-value {
-		display: flex;
-		align-items: center;
-	}
-
-	.credential-action {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: var(--color-text-base);
-	}
-
-	.readonly-container {
-		padding-right: 0.5em;
+	> * {
+		margin-bottom: var(--spacing-xs);
 	}
 }
 
+.warning {
+	min-width: 20px;
+	margin-left: 5px;
+	color: #ff8080;
+	font-size: var(--font-size-s);
+}
+
+.edit {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: var(--color-text-base);
+	min-width: 20px;
+	margin-left: 5px;
+	font-size: var(--font-size-s);
+}
+
+.input {
+	display: flex;
+	align-items: center;
+}
+
+.hasIssues {
+	composes: input;
+	--input-border-color: var(--color-danger);
+}
 </style>
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 483612602d..5dd2c82f06 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -10,10 +10,9 @@
 					</n8n-tooltip>
 				</a>
 			</span>
-			<span v-else>No node active</span>
 		</div>
 		<div class="node-is-not-valid" v-if="node && !nodeValid">
-			The node is not valid as its type "{{node.type}}" is unknown.
+			<n8n-text>The node is not valid as its type "{{node.type}}" is unknown.</n8n-text>
 		</div>
 		<div class="node-parameters-wrapper" v-if="node && nodeValid">
 			<el-tabs stretch @tab-click="handleTabClick">
@@ -21,8 +20,8 @@
 					<node-credentials :node="node" @credentialSelected="credentialSelected"></node-credentials>
 					<node-webhooks :node="node" :nodeType="nodeType" />
 					<parameter-input-list :parameters="parametersNoneSetting" :hideDelete="true" :nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged" />
-					<div v-if="parametersNoneSetting.length === 0">
-						This node does not have any parameters.
+					<div v-if="parametersNoneSetting.length === 0" class="no-parameters">
+						<n8n-text>This node does not have any parameters.</n8n-text>
 					</div>
 				</el-tab-pane>
 				<el-tab-pane label="Settings">
@@ -521,7 +520,10 @@ export default mixins(
 	overflow: hidden;
 	min-width: 350px;
 	max-width: 350px;
-	font-size: var(--font-size-s);
+
+	.no-parameters {
+		margin-top: var(--spacing-xs);
+	}
 
 	.header-side-menu {
 		padding: 1em 0 1em 1.8em;
@@ -547,10 +549,10 @@ export default mixins(
 
 	.node-parameters-wrapper {
 		height: 100%;
-		font-size: .9em;
 
 		.el-tabs__header {
 			background-color: #fff5f2;
+			margin-bottom: 0;
 		}
 
 		.el-tabs {
@@ -561,13 +563,13 @@ export default mixins(
 				padding-bottom: 180px;
 
 				.el-tab-pane {
-					margin: 0 1em;
+					margin: 0 var(--spacing-s);
 				}
 			}
 		}
 
 		.el-tabs__nav {
-			padding-bottom: 1em;
+			padding-bottom: var(--spacing-xs);
 		}
 
 		.add-option {
@@ -621,14 +623,6 @@ export default mixins(
 	padding: 0 1em;
 }
 
-.parameter-name {
-	line-height: 1.5;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	align-self: center;
-}
-
 .color-reset-button-wrapper {
 	position: relative;
 
diff --git a/packages/editor-ui/src/components/NodeWebhooks.vue b/packages/editor-ui/src/components/NodeWebhooks.vue
index ab0a8d95b4..c08ec51f54 100644
--- a/packages/editor-ui/src/components/NodeWebhooks.vue
+++ b/packages/editor-ui/src/components/NodeWebhooks.vue
@@ -128,14 +128,14 @@ export default mixins(
 <style scoped lang="scss">
 
 .webhoooks {
-	padding: 0.7em;
-	font-size: 0.9em;
-	margin: 0.5em 0;
+	padding-bottom: var(--spacing-xs);
+	margin: var(--spacing-xs) 0;
 	border-bottom: 1px solid #ccc;
 
 	.headline {
 		color: $--color-primary;
 		font-weight: 600;
+		font-size: var(--font-size-2xs);
 	}
 }
 
@@ -154,8 +154,8 @@ export default mixins(
 	margin-left: 5px;
 	text-align: center;
 	border-radius: 2px;
-	font-size: 0.8em;
-	font-weight: 600;
+	font-size: var(--font-size-2xs);
+	font-weight: var(--font-weight-bold);
 	color: #fff;
 }
 
@@ -175,11 +175,11 @@ export default mixins(
 .url-field {
 	display: inline-block;
 	width: calc(100% - 60px);
-	margin-left: 50px;
+	margin-left: 55px;
 }
 
 .url-selection {
-	margin-top: 1em;
+	margin-top: var(--spacing-xs);
 }
 
 .minimize-button {
@@ -205,12 +205,11 @@ export default mixins(
 	position: relative;
 	top: 0;
 	width: 100%;
-	font-size: 0.9em;
+	font-size: var(--font-size-2xs);
 	white-space: normal;
 	overflow: visible;
 	text-overflow: initial;
 	color: #404040;
-	padding: 0.5em;
 	text-align: left;
 	direction: ltr;
 	word-break: break-all;
@@ -219,9 +218,8 @@ export default mixins(
 .webhook-wrapper {
 	line-height: 1.5;
 	position: relative;
-	margin: 1em 0 0.5em 0;
+	margin-top: var(--spacing-xs);
 	background-color: #fff;
-	padding: 2px 0;
 	border-radius: 3px;
 }
 </style>
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 5ea58f5f4c..99720e9c27 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -16,7 +16,7 @@
 			<code-edit :dialogVisible="codeEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeCodeEditDialog" @valueChanged="expressionUpdated"></code-edit>
 			<text-edit :dialogVisible="textEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeTextEditDialog" @valueChanged="expressionUpdated"></text-edit>
 
-			<div v-if="isEditor === true" class="clickable" @click="displayEditDialog()">
+			<div v-if="isEditor === true" class="code-edit clickable" @click="displayEditDialog()">
 				<prism-editor v-if="!codeEditDialogVisible" :lineNumbers="true" :readonly="true" :code="displayValue" language="js"></prism-editor>
 			</div>
 
@@ -515,8 +515,9 @@ export default mixins(
 				const classes = [];
 				const rows = this.getArgument('rows');
 				const isTextarea = this.parameter.type === 'string' && rows !== undefined;
+				const isSwitch = this.parameter.type === 'boolean' && !this.isValueExpression;
 
-				if (!isTextarea) {
+				if (!isTextarea && !isSwitch) {
 					classes.push('parameter-value-container');
 				}
 				if (this.isValueExpression) {
@@ -597,7 +598,7 @@ export default mixins(
 						parameter_field_type: this.parameter.type,
 						new_expression: !this.isValueExpression,
 						workflow_id: this.$store.getters.workflowId,
-					});	
+					});
 				}
 			},
 			closeTextEditDialog () {
@@ -664,6 +665,8 @@ export default mixins(
 						(this.$refs.inputField.$el.querySelector(this.getStringInputType === 'textarea' ? 'textarea' : 'input') as HTMLInputElement).focus();
 					}
 				});
+
+				this.$emit('focus');
 			},
 			rgbaToHex (value: string): string | null {
 				// Convert rgba to hex from: https://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
@@ -775,8 +778,12 @@ export default mixins(
 
 <style scoped lang="scss">
 
+.code-edit {
+	font-size: var(--font-size-xs);
+}
+
 .switch-input {
-	margin: 5px 0;
+	margin: 2px 0;
 }
 
 .parameter-value-container {
@@ -804,7 +811,7 @@ export default mixins(
 	text-align: right;
 	float: right;
 	color: #ff8080;
-	font-size: 1.2em;
+	font-size: var(--font-size-s);
 }
 
 ::v-deep .color-input {
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/editor-ui/src/components/ParameterInputExpanded.vue
index 3566e1e700..4a9148c487 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -3,6 +3,7 @@
 		:label="parameter.displayName"
 		:tooltipText="parameter.description"
 		:required="parameter.required"
+		:showTooltip="focused"
 	>
 		<parameter-input
 			:parameter="parameter"
@@ -12,7 +13,7 @@
 			:displayOptions="true"
 			:documentationUrl="documentationUrl"
 			:errorHighlight="showRequiredErrors"
-
+			@focus="onFocus"
 			@blur="onBlur"
 			@textInput="valueChanged"
 			@valueChanged="valueChanged"
@@ -48,7 +49,8 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			blurred: false,
+			focused: false,
+			blurredEver: false,
 		};
 	},
 	computed: {
@@ -57,7 +59,7 @@ export default Vue.extend({
 				return false;
 			}
 
-			if (this.blurred || this.showValidationWarnings) {
+			if (this.blurredEver || this.showValidationWarnings) {
 				if (this.$props.parameter.type === 'string') {
 					return !this.value;
 				}
@@ -71,8 +73,12 @@ export default Vue.extend({
 		},
 	},
 	methods: {
+		onFocus() {
+			this.focused = true;
+		},
 		onBlur() {
-			this.blurred = true;
+			this.blurredEver = true;
+			this.focused = false;
 		},
 		valueChanged(parameterData: IUpdateInformation) {
 			this.$emit('change', parameterData);
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index d7cd061d5c..f01a0f00be 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -1,16 +1,22 @@
 <template>
-	<el-row class="parameter-wrapper" :class="{'multi-line': isMultiLineParameter}">
-		<el-col :span="isMultiLineParameter ? 24 : 10" class="parameter-name" :class="{'multi-line': isMultiLineParameter}">
-			<span class="title" :title="parameter.displayName">{{parameter.displayName}}</span>:
-			<n8n-tooltip class="parameter-info" placement="top" v-if="parameter.description" >
-				<div slot="content" v-html="addTargetBlank(parameter.description)"></div>
-				<font-awesome-icon icon="question-circle" />
-			</n8n-tooltip>
-		</el-col>
-		<el-col :span="isMultiLineParameter ? 24 : 14" class="parameter-value">
-			<parameter-input :parameter="parameter" :value="value" :displayOptions="displayOptions" :path="path" :isReadOnly="isReadOnly" @valueChanged="valueChanged" inputSize="small" />
-		</el-col>
-	</el-row>
+	<n8n-input-label
+		:label="parameter.displayName"
+		:tooltipText="parameter.description"
+		:showTooltip="focused"
+		:bold="false"
+		size="small"
+	>
+		<parameter-input
+			:parameter="parameter"
+			:value="value"
+			:displayOptions="displayOptions"
+			:path="path"
+			:isReadOnly="isReadOnly"
+			@valueChanged="valueChanged"
+			@focus="focused = true"
+			@blur="focused = false"
+			inputSize="small" />
+	</n8n-input-label>
 </template>
 
 <script lang="ts">
@@ -21,7 +27,6 @@ import {
 } from '@/Interface';
 
 import ParameterInput from '@/components/ParameterInput.vue';
-import { addTargetBlank } from './helpers';
 
 export default Vue
 	.extend({
@@ -29,21 +34,10 @@ export default Vue
 		components: {
 			ParameterInput,
 		},
-		computed: {
-			isMultiLineParameter () {
-				if (this.level > 4) {
-					return true;
-				}
-				const rows = this.getArgument('rows');
-				if (rows !== undefined && rows > 1) {
-					return true;
-				}
-
-				return false;
-			},
-			level (): number {
-				return this.path.split('.').length;
-			},
+		data() {
+			return {
+				focused: false,
+			};
 		},
 		props: [
 			'displayOptions',
@@ -53,7 +47,6 @@ export default Vue
 			'value',
 		],
 		methods: {
-			addTargetBlank,
 			getArgument (argumentName: string): string | number | boolean | undefined {
 				if (this.parameter.typeOptions === undefined) {
 					return undefined;
@@ -71,46 +64,3 @@ export default Vue
 		},
 	});
 </script>
-
-<style lang="scss">
-
-.parameter-wrapper {
-	display: flex;
-	align-items: center;
-
-	&.multi-line {
-		flex-direction: column;
-	}
-
-	.option {
-		margin: 1em;
-	}
-
-	.parameter-info {
-		background-color: #ffffffaa;
-		display: none;
-		position: absolute;
-		right: 2px;
-		top: 1px;
-	}
-
-	.parameter-name {
-		position: relative;
-
-		&:hover {
-			.parameter-info {
-				display: inline;
-			}
-		}
-
-		&.multi-line {
-			line-height: 1.5em;
-		}
-	}
-
-	.title {
-		font-weight: 400;
-	}
-}
-
-</style>
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 0db342f6ab..8448e88c26 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="paramter-input-list-wrapper">
-		<div v-for="parameter in filteredParameters" :key="parameter.name">
+		<div v-for="parameter in filteredParameters" :key="parameter.name" :class="{indent}">
 			<div
 				v-if="multipleValues(parameter) === true && parameter.type !== 'fixedCollection'"
 				class="parameter-item"
@@ -14,28 +14,31 @@
 				/>
 			</div>
 
-			<div v-else-if="parameter.type === 'notice'" v-html="parameter.displayName" class="parameter-item parameter-notice"></div>
+			<div v-else-if="parameter.type === 'notice'" class="parameter-item parameter-notice">
+				<n8n-text size="small">
+					<span v-html="parameter.displayName"></span>
+				</n8n-text>
+			</div>
 
 			<div
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
 				class="multi-parameter"
 			>
-				<div class="parameter-name" :title="parameter.displayName">
-					<div class="delete-option clickable" title="Delete" v-if="hideDelete !== true && !isReadOnly">
-						<font-awesome-icon
-							icon="trash"
-							class="reset-icon clickable"
-							title="Parameter Options"
-							@click="deleteOption(parameter.name)"
-						/>
-					</div>
-					{{parameter.displayName}}:
-					<n8n-tooltip placement="top" class="parameter-info" v-if="parameter.description" >
-						<div slot="content" v-html="addTargetBlank(parameter.description)"></div>
-						<font-awesome-icon icon="question-circle"/>
-					</n8n-tooltip>
+				<div class="delete-option clickable" title="Delete" v-if="hideDelete !== true && !isReadOnly">
+					<font-awesome-icon
+						icon="trash"
+						class="reset-icon clickable"
+						title="Parameter Options"
+						@click="deleteOption(parameter.name)"
+					/>
 				</div>
-				<div>
+				<n8n-input-label
+					:label="parameter.displayName"
+					:tooltipText="parameter.description"
+					size="small"
+					:underline="true"
+					:labelHoverableOnly="true"
+				>
 					<collection-parameter
 						v-if="parameter.type === 'collection'"
 						:parameter="parameter"
@@ -52,7 +55,7 @@
 						:path="getPath(parameter.name)"
 						@valueChanged="valueChanged"
 					/>
-				</div>
+				</n8n-input-label>
 			</div>
 
 			<div v-else-if="displayNodeParameter(parameter)" class="parameter-item">
@@ -93,8 +96,6 @@ import { genericHelpers } from '@/components/mixins/genericHelpers';
 import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 
-import { addTargetBlank } from './helpers';
-
 import { get, set } from 'lodash';
 
 import mixins from 'vue-typed-mixins';
@@ -114,6 +115,7 @@ export default mixins(
 			'parameters', // INodeProperties
 			'path', // string
 			'hideDelete', // boolean
+			'indent',
 		],
 		computed: {
 			filteredParameters (): INodeProperties[] {
@@ -124,7 +126,6 @@ export default mixins(
 			},
 		},
 		methods: {
-			addTargetBlank,
 			multipleValues (parameter: INodeProperties): boolean {
 				if (this.getArgument('multipleValues', parameter) === true) {
 					return true;
@@ -260,50 +261,42 @@ export default mixins(
 		position: absolute;
 		z-index: 999;
 		color: #f56c6c;
+		font-size: var(--font-size-2xs);
 
 		&:hover {
 			color: #ff0000;
 		}
 	}
 
+	.indent > div {
+		padding-left: var(--spacing-s);
+	}
+
 	.multi-parameter {
 		position: relative;
-		margin: 0.5em 0;
-		padding: 0.5em 0;
+		margin: var(--spacing-xs) 0;
 
-		>.parameter-name {
-			font-weight: 600;
-			border-bottom: 1px solid #999;
-
-			&:hover {
-				.parameter-info {
-					display: inline;
-				}
-			}
-
-			.delete-option {
-				top: 0;
-				left: -0.9em;
-			}
-
-			.parameter-info {
-				display: none;
-			}
+		.delete-option {
+			top: 0;
+			left: 0;
+		}
 
+		.parameter-info {
+			display: none;
 		}
 	}
 
 	.parameter-item {
 		position: relative;
-		margin: 8px 0;
+		margin: var(--spacing-xs) 0;
 
 		>.delete-option {
-			left: -0.9em;
-			top: 0.6em;
+			top: var(--spacing-5xs);
+			left: 0;
 		}
 	}
 	.parameter-item:hover > .delete-option,
-	.parameter-name:hover > .delete-option {
+	.multi-parameter:hover > .delete-option {
 		display: block;
 	}
 
@@ -311,9 +304,7 @@ export default mixins(
 		background-color: #fff5d3;
 		color: $--custom-font-black;
 		margin: 0.3em 0;
-		padding: 0.8em;
-		line-height: 1.5;
-		word-break: normal;
+		padding: 0.7em;
 
 		a {
 			font-weight: var(--font-weight-bold);
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 02bbecfb43..925c23d8a3 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -17,31 +17,31 @@
 
 		<div class="header">
 			<div class="title-text">
-				<strong v-if="dataCount < maxDisplayItems">
+				<n8n-text :bold="true" v-if="dataCount < maxDisplayItems">
 					Items: {{ dataCount }}
-				</strong>
+				</n8n-text>
 				<div v-else class="title-text">
-					<strong>Items:</strong>
+					<n8n-text :bold="true">Items:</n8n-text>
 					<span class="opts">
 						<n8n-select size="mini" v-model="maxDisplayItems" @click.stop>
 							<n8n-option v-for="option in maxDisplayItemsOptions" :label="option" :value="option" :key="option" />
 						</n8n-select>
 					</span>/
-					<strong>{{ dataCount }}</strong>
+					<n8n-text :bold="true">{{ dataCount }}</n8n-text>
 				</div>
 				<n8n-tooltip
 					v-if="runMetadata"
 					placement="right"
 				>
 					<div slot="content">
-						<strong>Start Time:</strong> {{runMetadata.startTime}}<br/>
-						<strong>Execution Time:</strong> {{runMetadata.executionTime}} ms
+						<n8n-text :bold="true" size="small">Start Time:</n8n-text> {{runMetadata.startTime}}<br/>
+						<n8n-text :bold="true" size="small">Execution Time:</n8n-text> {{runMetadata.executionTime}} ms
 					</div>
 					<font-awesome-icon icon="info-circle" class="primary-color" />
 				</n8n-tooltip>
-				<span v-if="maxOutputIndex > 0">
+				<n8n-text :bold="true" v-if="maxOutputIndex > 0">
 					| Output:
-				</span>
+				</n8n-text>
 				<span class="opts" v-if="maxOutputIndex > 0" >
 					<n8n-select size="mini" v-model="outputIndex" @click.stop>
 						<n8n-option v-for="option in (maxOutputIndex + 1)" :label="getOutputName(option-1)" :value="option -1" :key="option">
@@ -49,9 +49,9 @@
 					</n8n-select>
 				</span>
 
-				<span v-if="maxRunIndex > 0">
+				<n8n-text :bold="true" v-if="maxRunIndex > 0">
 					| Data of Execution:
-				</span>
+				</n8n-text>
 				<span class="opts">
 					<n8n-select v-if="maxRunIndex > 0" size="mini" v-model="runIndex" @click.stop>
 						<n8n-option v-for="option in (maxRunIndex + 1)" :label="option + '/' + (maxRunIndex+1)" :value="option-1" :key="option">
@@ -186,7 +186,7 @@
 			</span>
 			<div v-else class="message">
 				<div>
-					<strong>No data</strong><br />
+					<n8n-text :bold="true">No data</n8n-text ><br />
 					<br />
 					Data returned by this node will display here<br />
 				</div>
@@ -659,6 +659,7 @@ export default mixins(
 		overflow-y: auto;
 		line-height: 1.5;
 		word-break: normal;
+		font-size: var(--font-size-s);
 
 		.binary-data-row {
 			display: inline-flex;
diff --git a/packages/editor-ui/src/components/TextEdit.vue b/packages/editor-ui/src/components/TextEdit.vue
index 52fc71166b..fbcb79c838 100644
--- a/packages/editor-ui/src/components/TextEdit.vue
+++ b/packages/editor-ui/src/components/TextEdit.vue
@@ -2,13 +2,12 @@
 	<div v-if="dialogVisible">
 		<el-dialog :visible="dialogVisible" append-to-body width="80%" :title="`Edit ${parameter.displayName}`" :before-close="closeDialog">
 
-			<div class="text-editor-wrapper ignore-key-press">
-				<div class="editor-description">
-					{{parameter.displayName}}:
-				</div>
-				<div class="text-editor" @keydown.stop @keydown.esc="closeDialog()">
-					<n8n-input v-model="tempValue" type="textarea" ref="inputField" :value="value" :placeholder="parameter.placeholder" @change="valueChanged" @keydown.stop="noOp" :rows="15" />
-				</div>
+			<div class="ignore-key-press">
+				<n8n-input-label :label="parameter.displayName">
+					<div @keydown.stop @keydown.esc="closeDialog()">
+						<n8n-input v-model="tempValue" type="textarea" ref="inputField" :value="value" :placeholder="parameter.placeholder" @change="valueChanged" @keydown.stop="noOp" :rows="15" />
+					</div>
+				</n8n-input-label>
 			</div>
 
 		</el-dialog>
@@ -60,10 +59,3 @@ export default Vue.extend({
 	},
 });
 </script>
-
-<style scoped>
-.editor-description {
-	font-weight: bold;
-	padding: 0 0 0.5em 0.2em;;
-}
-</style>
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 04c7d218dc..92b2f4125c 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -516,6 +516,7 @@ export default mixins(
 
 <style scoped lang="scss">
 .workflow-settings {
+	font-size: var(--font-size-s);
 	.el-row {
 		padding: 0.25em 0;
 	}
diff --git a/packages/editor-ui/src/components/helpers.ts b/packages/editor-ui/src/components/helpers.ts
index 37caf7c1d1..889258a9bc 100644
--- a/packages/editor-ui/src/components/helpers.ts
+++ b/packages/editor-ui/src/components/helpers.ts
@@ -2,12 +2,6 @@ import dateformat from 'dateformat';
 
 const KEYWORDS_TO_FILTER = ['API', 'OAuth1', 'OAuth2'];
 
-export function addTargetBlank(html: string) {
-	return html.includes('href=')
-		? html.replace(/href=/g, 'target="_blank" href=')
-		: html;
-}
-
 export function convertToDisplayDate (epochTime: number) {
 	return dateformat(epochTime, 'yyyy-mm-dd HH:MM:ss');
 }

From ce066a160f0ac94122830350b3ef46a04385da0e Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 27 Oct 2021 22:00:13 +0200
Subject: [PATCH 2/3] :zap: Remove unnessasry <br/> (#2340)

* introduce analytics

* add user survey backend

* add user survey backend

* set answers on survey submit

Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>

* change name to personalization

* lint

Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>

* N8n 2495 add personalization modal (#2280)

* update modals

* add onboarding modal

* implement questions

* introduce analytics

* simplify impl

* implement survey handling

* add personalized cateogry

* update modal behavior

* add thank you view

* handle empty cases

* rename modal

* standarize modal names

* update image, add tags to headings

* remove unused file

* remove unused interfaces

* clean up footer spacing

* introduce analytics

* refactor to fix bug

* update endpoint

* set min height

* update stories

* update naming from questions to survey

* remove spacing after core categories

* fix bug in logic

* sort nodes

* rename types

* merge with be

* rename userSurvey

* clean up rest api

* use constants for keys

* use survey keys

* clean up types

* move personalization to its own file

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>

* update parameter inputs to be multiline

* update spacing

* Survey new options (#2300)

* split up options

* fix quotes

* remove unused import

* refactor node credentials

* add user created workflow event (#2301)

* update multi params

* simplify env vars

* fix versionCli on FE

* update personalization env

* clean up node detail settings

* fix event User opened Credentials panel

* fix font sizes across modals

* clean up input spacing

* fix select modal spacing

* increase spacing

* fix input copy

* fix webhook, tab spacing, retry button

* fix button sizes

* fix button size

* add mini xlarge sizes

* fix webhook spacing

* fix nodes panel event

* fix workflow id in workflow execute event

* improve telemetry error logging

* fix config and stop process events

* add flush call on n8n stop

* ready for release

* fix input error highlighting

* revert change

* update toggle spacing

* fix delete positioning

* keep tooltip while focused

* set strict size

* increase left spacing

* fix sort icons

* remove unnessasry <br/>

* remove unnessary break

* remove unnessary margin

* clean unused functionality

* remove unnessary css

* remove duplicate tracking

* only show tooltip when hovering over label

* remove extra space

* add br

* remove extra space

* clean up commas

* clean up commas

* remove extra space

* remove extra space

* rewrite desc

* add commas

* add space

* remove extra space

* add space

* add dot

* update credentials section

* use includes

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../credentials/MongoDb.credentials.ts        |  2 +-
 .../SalesforceJwtApi.credentials.ts           |  2 +-
 .../AcuitySchedulingTrigger.node.ts           |  2 +-
 .../nodes/Airtable/Airtable.node.ts           |  6 +-
 .../nodes/ApiTemplateIo/ApiTemplateIo.node.ts |  2 +-
 packages/nodes-base/nodes/Asana/Asana.node.ts |  6 +-
 .../nodes/Aws/S3/FileDescription.ts           |  4 +-
 .../nodes-base/nodes/Box/FileDescription.ts   |  4 +-
 .../nodes/Brandfetch/Brandfetch.node.ts       |  2 +-
 .../Cisco/Webex/CiscoWebexTrigger.node.ts     |  2 +-
 .../nodes/Clearbit/Clearbit.node.ts           |  2 +-
 .../nodes/ClickUp/TaskDescription.ts          |  4 +-
 .../nodes-base/nodes/Coda/TableDescription.ts | 22 +++----
 packages/nodes-base/nodes/Compression.node.ts |  4 +-
 .../nodes/Cortex/AnalyzerDescriptions.ts      |  2 +-
 .../nodes/Demio/EventDescription.ts           |  4 +-
 .../nodes-base/nodes/Disqus/Disqus.node.ts    |  2 +-
 .../nodes-base/nodes/Dropbox/Dropbox.node.ts  |  4 +-
 packages/nodes-base/nodes/EditImage.node.ts   |  4 +-
 packages/nodes-base/nodes/Egoi/Egoi.node.ts   |  2 +-
 .../nodes-base/nodes/EmailReadImap.node.ts    | 10 ++--
 packages/nodes-base/nodes/EmailSend.node.ts   |  2 +-
 .../Eventbrite/EventbriteTrigger.node.ts      |  2 +-
 .../nodes/FileMaker/FileMaker.node.ts         |  2 +-
 .../nodes-base/nodes/Flow/FlowTrigger.node.ts |  4 +-
 .../nodes-base/nodes/Flow/TaskDescription.ts  |  4 +-
 .../nodes/Freshdesk/Freshdesk.node.ts         |  8 +--
 .../Git/descriptions/CommitDescription.ts     |  3 +-
 .../nodes-base/nodes/Github/Github.node.ts    |  6 +-
 .../nodes/Github/GithubTrigger.node.ts        |  4 +-
 .../nodes/Google/Books/GoogleBooks.node.ts    |  2 +-
 .../nodes/Google/Drive/GoogleDrive.node.ts    | 32 +++++-----
 .../nodes/Google/Gmail/DraftDescription.ts    |  4 +-
 .../nodes/Google/Gmail/MessageDescription.ts  |  4 +-
 .../nodes/Google/Sheet/GoogleSheets.node.ts   |  8 +--
 .../nodes/Google/Slides/GoogleSlides.node.ts  |  2 +-
 .../Google/Translate/GoogleTranslate.node.ts  |  2 +-
 .../HelpScout/ConversationDescription.ts      |  4 +-
 .../nodes/HelpScout/CustomerDescription.ts    |  2 +-
 .../HomeAssistant/CameraProxyDescription.ts   |  2 +-
 .../nodes/HtmlExtract/HtmlExtract.node.ts     |  4 +-
 packages/nodes-base/nodes/HttpRequest.node.ts |  4 +-
 .../nodes/Hubspot/CompanyDescription.ts       |  2 +-
 .../nodes/Hubspot/ContactDescription.ts       |  2 +-
 .../nodes/Hubspot/DealDescription.ts          |  4 +-
 .../nodes/Hubspot/TicketDescription.ts        |  4 +-
 packages/nodes-base/nodes/ICalendar.node.ts   |  2 +-
 .../nodes/Intercom/CompanyDescription.ts      |  2 +-
 .../nodes/Intercom/LeadDescription.ts         |  2 +-
 .../nodes/Intercom/UserDescription.ts         |  2 +-
 .../nodes/Jira/IssueCommentDescription.ts     |  6 +-
 .../nodes-base/nodes/Jira/IssueDescription.ts | 14 ++---
 .../nodes/JotForm/JotFormTrigger.node.ts      |  2 +-
 .../nodes-base/nodes/Keap/FileDescription.ts  |  2 +-
 .../nodes/LingvaNex/LingvaNex.node.ts         |  2 +-
 .../nodes/Mailchimp/Mailchimp.node.ts         |  2 +-
 .../nodes-base/nodes/Mailgun/Mailgun.node.ts  |  2 +-
 .../nodes/Mandrill/Mandrill.node.ts           | 24 ++++----
 .../v1/actions/channel/members/description.ts |  2 +-
 .../nodes/Mautic/ContactDescription.ts        |  2 +-
 packages/nodes-base/nodes/Merge.node.ts       |  2 +-
 .../Microsoft/Excel/WorksheetDescription.ts   |  2 +-
 .../Microsoft/OneDrive/FileDescription.ts     |  4 +-
 .../Outlook/DraftMessageSharedDescription.ts  |  2 +-
 .../Outlook/MessageAttachmentDescription.ts   |  2 +-
 .../Microsoft/Outlook/MessageDescription.ts   |  2 +-
 .../nodes-base/nodes/MoveBinaryData.node.ts   |  8 +--
 .../nodes/NextCloud/NextCloud.node.ts         |  4 +-
 .../nodes/PayPal/PaymentDescription.ts        |  8 +--
 .../nodes/Phantombuster/AgentDescription.ts   |  4 +-
 .../nodes/Pipedrive/Pipedrive.node.ts         |  4 +-
 .../nodes/Pushbullet/Pushbullet.node.ts       |  2 +-
 .../nodes-base/nodes/ReadBinaryFile.node.ts   |  2 +-
 .../nodes-base/nodes/ReadBinaryFiles.node.ts  |  2 +-
 packages/nodes-base/nodes/ReadPdf.node.ts     |  2 +-
 .../nodes/Salesforce/AttachmentDescription.ts |  6 +-
 .../nodes/Salesforce/DocumentDescription.ts   |  2 +-
 .../nodes/Salesforce/TaskDescription.ts       | 60 +++++++++----------
 .../descriptions/ReportDescription.ts         |  2 +-
 packages/nodes-base/nodes/Set.node.ts         |  2 +-
 .../nodes-base/nodes/Signl4/Signl4.node.ts    | 10 ++--
 .../nodes/Slack/ChannelDescription.ts         |  2 +-
 .../nodes-base/nodes/Slack/FileDescription.ts |  2 +-
 .../nodes-base/nodes/SpreadsheetFile.node.ts  |  6 +-
 packages/nodes-base/nodes/Ssh/Ssh.node.ts     |  2 +-
 .../nodes-base/nodes/Stackby/Stackby.node.ts  |  2 +-
 .../nodes/Strava/StravaTrigger.node.ts        |  2 +-
 .../SurveyMonkey/SurveyMonkeyTrigger.node.ts  |  2 +-
 .../nodes/Tapfiliate/AffiliateDescription.ts  |  2 +-
 .../nodes/Telegram/Telegram.node.ts           | 24 ++++----
 .../nodes/Trello/BoardDescription.ts          |  2 +-
 .../nodes/Trello/CardDescription.ts           |  6 +-
 .../nodes/Twitter/DirectMessageDescription.ts |  2 +-
 .../nodes/Twitter/TweetDescription.ts         |  2 +-
 packages/nodes-base/nodes/Wait.node.ts        |  8 +--
 packages/nodes-base/nodes/Webhook.node.ts     |  6 +-
 .../nodes-base/nodes/WriteBinaryFile.node.ts  |  2 +-
 packages/nodes-base/nodes/Xml.node.ts         |  4 +-
 .../nodes/Zulip/MessageDescription.ts         |  2 +-
 99 files changed, 242 insertions(+), 243 deletions(-)

diff --git a/packages/nodes-base/credentials/MongoDb.credentials.ts b/packages/nodes-base/credentials/MongoDb.credentials.ts
index 8884c577a0..896a28c0b3 100644
--- a/packages/nodes-base/credentials/MongoDb.credentials.ts
+++ b/packages/nodes-base/credentials/MongoDb.credentials.ts
@@ -38,7 +38,7 @@ export class MongoDb implements ICredentialType {
 			default: '',
 			placeholder: 'mongodb://<USERNAME>:<PASSWORD>@localhost:27017/?authSource=admin&readPreference=primary&appname=n8n&ssl=false',
 			required: false,
-			description: `If provided, the value here will be used as a MongoDB connection string,<br />
+			description: `If provided, the value here will be used as a MongoDB connection string,
 						  and the MongoDB credentials will be ignored`,
 		},
 		{
diff --git a/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts b/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts
index bd35f3440c..58c2df5d4b 100644
--- a/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts
+++ b/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts
@@ -48,7 +48,7 @@ export class SalesforceJwtApi implements ICredentialType {
 			},
 			default: '',
 			required: true,
-			description: 'Use the multiline editor.  Make sure it is in standard PEM key format:<br />-----BEGIN PRIVATE KEY-----<br />KEY DATA GOES HERE<br />-----END PRIVATE KEY-----',
+			description: 'Use the multiline editor. Make sure it is in standard PEM key format:<br />-----BEGIN PRIVATE KEY-----<br />KEY DATA GOES HERE<br />-----END PRIVATE KEY-----',
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
index 289f452213..adb59116d0 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
@@ -117,7 +117,7 @@ export class AcuitySchedulingTrigger implements INodeType {
 				name: 'resolveData',
 				type: 'boolean',
 				default: true,
-				description: 'By default does the webhook-data only contain the ID of the object.<br />If this option gets activated it will resolve the data automatically.',
+				description: 'By default does the webhook-data only contain the ID of the object.<br />If this option gets activated, it will resolve the data automatically.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 327de8ccac..afa095934e 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -256,7 +256,7 @@ export class Airtable implements INodeType {
 						type: 'string',
 						default: '',
 						placeholder: 'NOT({Name} = \'\')',
-						description: 'A formula used to filter records. The formula will be evaluated for each<br />record, and if the result is not 0, false, "", NaN, [], or #Error!<br />the record will be included in the response.',
+						description: 'A formula used to filter records. The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response.',
 					},
 					{
 						displayName: 'Sort',
@@ -309,7 +309,7 @@ export class Airtable implements INodeType {
 						type: 'string',
 						default: '',
 						placeholder: 'All Stories',
-						description: 'The name or ID of a view in the Stories table. If set,<br />only the records in that view will be returned. The records<br />will be sorted according to the order of the view.',
+						description: 'The name or ID of a view in the Stories table. If set, only the records in that view will be returned. The records will be sorted according to the order of the view.',
 					},
 				],
 			},
@@ -741,4 +741,4 @@ export class Airtable implements INodeType {
 
 		return [this.helpers.returnJsonArray(returnData)];
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
index 1bbf47e5d1..5e915807b7 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -180,7 +180,7 @@ export class ApiTemplateIo implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 			{
 				displayName: 'Binary Property',
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index 644a9fae12..b0308d36a2 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -599,7 +599,7 @@ export class Asana implements INodeType {
 							loadOptionsMethod: 'getUsers',
 						},
 						default: '',
-						description: 'The assignee to filter tasks on.  Note: If you specify assignee, you must also specify the workspace to filter on.',
+						description: 'The assignee to filter tasks on. Note: If you specify assignee, you must also specify the workspace to filter on.',
 					},
 					{
 						displayName: 'Fields',
@@ -650,7 +650,7 @@ export class Asana implements INodeType {
 							loadOptionsMethod: 'getWorkspaces',
 						},
 						default: '',
-						description: 'The workspace to filter tasks on.  Note: If you specify workspace, you must also specify the assignee to filter on.',
+						description: 'The workspace to filter tasks on. Note: If you specify workspace, you must also specify the assignee to filter on.',
 					},
 					{
 						displayName: 'Completed Since',
@@ -1438,7 +1438,7 @@ export class Asana implements INodeType {
 						],
 					},
 				},
-				description: 'An identifier for the user to get data of. Can be one of an<br />email address,the globally unique identifier for the user,<br />or the keyword me to indicate the current user making the request.',
+				description: 'An identifier for the user to get data of. Can be one of an email address,the globally unique identifier for the user, or the keyword me to indicate the current user making the request.',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/Aws/S3/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
index ffff28c6ab..28904e0d0a 100644
--- a/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
+++ b/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
@@ -450,7 +450,7 @@ export const fileFields = [
 
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+		description: 'Name of the binary property which contains the data for the file to be uploaded.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -762,7 +762,7 @@ export const fileFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 /* -------------------------------------------------------------------------- */
 /*                                file:delete                                 */
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 7aa5a87d72..7e4f83ad39 100644
--- a/packages/nodes-base/nodes/Box/FileDescription.ts
+++ b/packages/nodes-base/nodes/Box/FileDescription.ts
@@ -194,7 +194,7 @@ export const fileFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -818,7 +818,7 @@ export const fileFields = [
 			},
 
 		},
-		description: 'Name of the binary property which contains<br />the data for the file.',
+		description: 'Name of the binary property which contains the data for the file.',
 	},
 	{
 		displayName: 'Parent ID',
diff --git a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
index 7f949b249b..8ac12d6dcb 100644
--- a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
+++ b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
@@ -95,7 +95,7 @@ export class Brandfetch implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 			{
 				displayName: 'Image Type',
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
index 950263b2cb..0fda5ed73a 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
@@ -107,7 +107,7 @@ export class CiscoWebexTrigger implements INodeType {
 					},
 				},
 				default: true,
-				description: 'By default the response only contain a reference to the data the user inputed<br />If this option gets activated it will resolve the data automatically.',
+				description: 'By default the response only contain a reference to the data the user inputed. If this option gets activated, it will resolve the data automatically.',
 			},
 			{
 				displayName: 'Filters',
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index 447d99e319..ba3eed4ba4 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -58,7 +58,7 @@ export class Clearbit implements INodeType {
 					{
 						name: 'Person',
 						value: 'person',
-						description: `The Person API lets you retrieve social information associated with an email address,<br/>
+						description: `The Person API lets you retrieve social information associated with an email address,
 						such as a person’s name, location and Twitter handle.`,
 					},
 				],
diff --git a/packages/nodes-base/nodes/ClickUp/TaskDescription.ts b/packages/nodes-base/nodes/ClickUp/TaskDescription.ts
index 687084cc72..b526f87264 100644
--- a/packages/nodes-base/nodes/ClickUp/TaskDescription.ts
+++ b/packages/nodes-base/nodes/ClickUp/TaskDescription.ts
@@ -1063,8 +1063,8 @@ export const taskFields = [
 			},
 		},
 		default: false,
-		description: `The value is JSON and will be parsed as such. Is needed<br />
-		if for example needed for labels which expects the value<br />
+		description: `The value is JSON and will be parsed as such. Is needed
+		if for example needed for labels which expects the value
 		to be an array.`,
 	},
 	{
diff --git a/packages/nodes-base/nodes/Coda/TableDescription.ts b/packages/nodes-base/nodes/Coda/TableDescription.ts
index 49ffd49027..918b8ec70f 100644
--- a/packages/nodes-base/nodes/Coda/TableDescription.ts
+++ b/packages/nodes-base/nodes/Coda/TableDescription.ts
@@ -133,8 +133,8 @@ export const tableFields = [
 				name: 'keyColumns',
 				type: 'string',
 				default: '',
-				description: `Optional column IDs, URLs, or names (fragile and discouraged)<br />,
-				specifying columns to be used as upsert keys. If more than one separate by ,`,
+				description: `Optional column IDs, URLs, or names (fragile and discouraged),
+				specifying columns to be used as upsert keys. If more than one separate by a comma (,)`,
 			},
 		],
 	},
@@ -202,10 +202,10 @@ export const tableFields = [
 				],
 			},
 		},
-		description: `ID or name of the row. Names are discouraged because<br />
-		they're easily prone to being changed by users. If you're<br />
-		using a name, be sure to URI-encode it. If there are<br />
-		multiple rows with the same value in the identifying column,<br />
+		description: `ID or name of the row. Names are discouraged because
+		they're easily prone to being changed by users. If you're
+		using a name, be sure to URI-encode it. If there are
+		multiple rows with the same value in the identifying column,
 		an arbitrary one will be selected`,
 	},
 	{
@@ -413,7 +413,7 @@ export const tableFields = [
 				type: 'boolean',
 				default: false,
 				description: `Use column names instead of column IDs in the returned output.</br>
-				This is generally discouraged as it is fragile. If columns<br />
+				This is generally discouraged as it is fragile. If columns
 				are renamed, code using original names may throw errors.`,
 			},
 			{
@@ -576,10 +576,10 @@ export const tableFields = [
 				],
 			},
 		},
-		description: `ID or name of the row. Names are discouraged because<br />
-		they're easily prone to being changed by users. If you're<br />
-		using a name, be sure to URI-encode it. If there are multiple<br />
-		rows with the same value in the identifying column, an arbitrary<br />
+		description: `ID or name of the row. Names are discouraged because
+		they're easily prone to being changed by users. If you're
+		using a name, be sure to URI-encode it. If there are multiple
+		rows with the same value in the identifying column, an arbitrary
 		one will be selected`,
 	},
 	{
diff --git a/packages/nodes-base/nodes/Compression.node.ts b/packages/nodes-base/nodes/Compression.node.ts
index bb8d6ab45c..308d6a02ee 100644
--- a/packages/nodes-base/nodes/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression.node.ts
@@ -96,7 +96,7 @@ export class Compression implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file(s) to be compress/decompress. Multiple can be used separated by ,',
+				description: 'Name of the binary property which contains the data for the file(s) to be compress/decompress. Multiple can be used separated by a comma (,)',
 			},
 			{
 				displayName: 'Output Format',
@@ -159,7 +159,7 @@ export class Compression implements INodeType {
 					},
 				},
 				placeholder: '',
-				description: 'Name of the binary property to which to<br />write the data of the compressed files.',
+				description: 'Name of the binary property to which to write the data of the compressed files.',
 			},
 			{
 				displayName: 'Output Prefix',
diff --git a/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts b/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
index d677c1a70e..1f9834cbd5 100644
--- a/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
+++ b/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
@@ -129,7 +129,7 @@ export const analyzerFields: INodeProperties[] = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 	{
 		displayName: 'TLP',
diff --git a/packages/nodes-base/nodes/Demio/EventDescription.ts b/packages/nodes-base/nodes/Demio/EventDescription.ts
index 882ec45dad..75d95156fd 100644
--- a/packages/nodes-base/nodes/Demio/EventDescription.ts
+++ b/packages/nodes-base/nodes/Demio/EventDescription.ts
@@ -279,7 +279,7 @@ export const eventFields = [
 								name: 'fieldId',
 								type: 'string',
 								default: '',
-								description: 'Each custom field\'s unique identifier<br /> can be found within the Event\'s Registration block in the Customize tab.',
+								description: 'Each custom field\'s unique identifier can be found within the Event\'s Registration block in the Customize tab.',
 							},
 							{
 								displayName: 'Value',
@@ -297,7 +297,7 @@ export const eventFields = [
 				name: 'ref_url',
 				type: 'string',
 				default: '',
-				description: 'Event Registration page URL. It can be useful when you<br /> do not know Event ID, but have Event link.',
+				description: 'Event Registration page URL. It can be useful when you do not know Event ID, but have Event link.',
 			},
 			{
 				displayName: 'GDPR',
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index 200cd3fe8a..e05c97d742 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -624,7 +624,7 @@ export class Disqus implements INodeType {
 						name: 'threadId',
 						type: 'string',
 						default: '',
-						description: 'Looks up a thread by ID. You may pass us the "ident"<br />query type instead of an ID by including "forum". You may<br />pass us the "link" query type to filter by URL. You must pass<br />the "forum" if you do not have the Pro API Access addon.',
+						description: 'Looks up a thread by ID. You may pass us the "ident" query type instead of an ID by including "forum". You may pass us the "link" query type to filter by URL. You must pass the "forum" if you do not have the Pro API Access addon.',
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 3f2e95ec14..9fc23d69d8 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -361,7 +361,7 @@ export class Dropbox implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 
 			// ----------------------------------
@@ -446,7 +446,7 @@ export class Dropbox implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+				description: 'Name of the binary property which contains the data for the file to be uploaded.',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/EditImage.node.ts b/packages/nodes-base/nodes/EditImage.node.ts
index a8add5a351..a499cabeb1 100644
--- a/packages/nodes-base/nodes/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage.node.ts
@@ -363,7 +363,7 @@ const nodeOperationOptions: INodeProperties[] = [
 				],
 			},
 		},
-		description: 'Max amount of characters in a line before a<br />line-break should get added.',
+		description: 'Max amount of characters in a line before a line-break should get added.',
 	},
 
 	// ----------------------------------
@@ -470,7 +470,7 @@ const nodeOperationOptions: INodeProperties[] = [
 				],
 			},
 		},
-		description: 'The name of the binary property which contains the data of the image to<br />composite on top of image which is found in Property Name.',
+		description: 'The name of the binary property which contains the data of the image to composite on top of image which is found in Property Name.',
 	},
 	{
 		displayName: 'Position X',
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index ab96a1bfdd..7f9d89150b 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -154,7 +154,7 @@ export class Egoi implements INodeType {
 					},
 				},
 				default: true,
-				description: 'By default the response just includes the contact id. If this option gets activated it<br />will resolve the data automatically.',
+				description: 'By default the response just includes the contact id. If this option gets activated, it will resolve the data automatically.',
 			},
 			{
 				displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index d07c2b5a9c..fb82827d6c 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -70,7 +70,7 @@ export class EmailReadImap implements INodeType {
 					},
 				],
 				default: 'read',
-				description: 'What to do after the email has been received. If "nothing" gets<br />selected it will be processed multiple times.',
+				description: 'What to do after the email has been received. If "nothing" gets selected it will be processed multiple times.',
 			},
 			{
 				displayName: 'Download Attachments',
@@ -122,7 +122,7 @@ export class EmailReadImap implements INodeType {
 						],
 					},
 				},
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 			{
 				displayName: 'Property Prefix Name',
@@ -139,7 +139,7 @@ export class EmailReadImap implements INodeType {
 						],
 					},
 				},
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 			{
 				displayName: 'Options',
@@ -399,7 +399,7 @@ export class EmailReadImap implements INodeType {
 						}
 						if (staticData.lastMessageUid !== undefined) {
 							searchCriteria.push(['UID', `${staticData.lastMessageUid as number}:*`]);
-							/** 
+							/**
 							 * A short explanation about UIDs and how they work
 							 * can be found here: https://dev.to/kehers/imap-new-messages-since-last-check-44gm
 							 * TL;DR:
@@ -413,7 +413,7 @@ export class EmailReadImap implements INodeType {
 							 */
 							Logger.debug('Querying for new messages on node "EmailReadImap"', {searchCriteria});
 						}
-				
+
 						const returnData = await getNewEmails(connection, searchCriteria);
 
 						if (returnData.length) {
diff --git a/packages/nodes-base/nodes/EmailSend.node.ts b/packages/nodes-base/nodes/EmailSend.node.ts
index 2c9a5e309f..0c1065c918 100644
--- a/packages/nodes-base/nodes/EmailSend.node.ts
+++ b/packages/nodes-base/nodes/EmailSend.node.ts
@@ -103,7 +103,7 @@ export class EmailSend implements INodeType {
 				name: 'attachments',
 				type: 'string',
 				default: '',
-				description: 'Name of the binary properties which contain<br />data which should be added to email as attachment.<br />Multiple ones can be comma separated.',
+				description: 'Name of the binary properties that contain data to add to email as attachment.<br />Multiple ones can be comma separated.',
 			},
 			{
 				displayName: 'Options',
diff --git a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
index 95cd14ab37..8f73b0f138 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
@@ -182,7 +182,7 @@ export class EventbriteTrigger implements INodeType {
 				name: 'resolveData',
 				type: 'boolean',
 				default: true,
-				description: 'By default does the webhook-data only contain the URL to receive<br />the object data manually. If this option gets activated it<br />will resolve the data automatically.',
+				description: 'By default does the webhook-data only contain the URL to receive the object data manually. If this option gets activated, it will resolve the data automatically.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index fcab16abbd..52bbc8cd90 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -202,7 +202,7 @@ export class FileMaker implements INodeType {
 					},
 				},
 				placeholder: 'Portals',
-				description: 'The portal result set to return. Use the portal object name or portal<br />table name. If this parameter is omitted, the API will return all<br />portal objects and records in the layout. For best performance<br />, pass the portal object name or portal table name.',
+				description: 'The portal result set to return. Use the portal object name or portal table name. If this parameter is omitted, the API will return all portal objects and records in the layout. For best performance, pass the portal object name or portal table name.',
 			},
 			// ----------------------------------
 			//         find/records
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
index f0a30c631e..b7e7122a4e 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
@@ -80,7 +80,7 @@ export class FlowTrigger implements INodeType {
 						],
 					},
 				},
-				description: `Lists ids, perhaps known better as "Projects" separated by ,`,
+				description: `Lists ids, perhaps known better as "Projects" separated by a comma (,)`,
 			},
 			{
 				displayName: 'Task ID',
@@ -100,7 +100,7 @@ export class FlowTrigger implements INodeType {
 						],
 					},
 				},
-				description: `Task ids separated by ,`,
+				description: `Task ids separated by a comma (,)`,
 			},
 		],
 
diff --git a/packages/nodes-base/nodes/Flow/TaskDescription.ts b/packages/nodes-base/nodes/Flow/TaskDescription.ts
index f981c7b75e..076947adee 100644
--- a/packages/nodes-base/nodes/Flow/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Flow/TaskDescription.ts
@@ -221,7 +221,7 @@ export const taskFields = [
 				type: 'string',
 				default: '',
 				required : false,
-				description: `A list of tag names to apply to the new task separated by ,`,
+				description: `A list of tag names to apply to the new task separated by a comma (,)`,
 			},
 		],
 	},
@@ -408,7 +408,7 @@ export const taskFields = [
 				name: 'tags',
 				type: 'string',
 				default: '',
-				description: `A list of tag names to apply to the new task separated by ,`,
+				description: `A list of tag names to apply to the new task separated by a comma (,)`,
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index fdbda06ae3..7882ba6465 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -398,7 +398,7 @@ export class Freshdesk implements INodeType {
 						name: 'ccEmails',
 						type: 'string',
 						default: '',
-						description: `Separated by , email addresses added in the 'cc' field of the incoming ticket email`,
+						description: `Separated by a comma (,) email addresses added in the 'cc' field of the incoming ticket email`,
 					},
 					{
 						displayName: 'Company',
@@ -485,7 +485,7 @@ export class Freshdesk implements INodeType {
 						name: 'tags',
 						type: 'string',
 						default: '',
-						description: `separated by , tags that have been associated with the ticket`,
+						description: `separated by a comma (,) tags that have been associated with the ticket`,
 					},
 					{
 						displayName: 'Type',
@@ -642,7 +642,7 @@ export class Freshdesk implements INodeType {
 						name: 'ccEmails',
 						type: 'string',
 						default: '',
-						description: `Separated by , email addresses added in the 'cc' field of the incoming ticket email`,
+						description: `Separated by a comma (,) email addresses added in the 'cc' field of the incoming ticket email`,
 					},
 					{
 						displayName: 'Company',
@@ -847,7 +847,7 @@ export class Freshdesk implements INodeType {
 						name: 'tags',
 						type: 'string',
 						default: '',
-						description: `separated by , tags that have been associated with the ticket`,
+						description: `separated by a comma (,) tags that have been associated with the ticket`,
 					},
 					{
 						displayName: 'Type',
diff --git a/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts b/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
index 5f955a2a58..e18f46b003 100644
--- a/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
+++ b/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
@@ -37,8 +37,7 @@ export const commitFields = [
 				type: 'string',
 				default: '',
 				placeholder: '/data/file1.json',
-				description: `Comma separated list of paths (absolute or relative to Repository Path) of<br />
-				files or folders to commit. If not set will all "added" files and folders be committed.`,
+				description: `Comma separated list of paths (absolute or relative to Repository Path) of files or folders to commit. If not set will all "added" files and folders be committed.`,
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index d9ec2640a8..9228f58dc3 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -487,7 +487,7 @@ export class Github implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file.',
+				description: 'Name of the binary property which contains the data for the file.',
 			},
 			{
 				displayName: 'Commit Message',
@@ -603,7 +603,7 @@ export class Github implements INodeType {
 						],
 					},
 				},
-				description: 'If set it will set the data of the file as binary property<br />instead of returning the raw API response.',
+				description: 'If set it will set the data of the file as binary property instead of returning the raw API response.',
 			},
 			{
 				displayName: 'Binary Property',
@@ -626,7 +626,7 @@ export class Github implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property in which to save<br />the binary data of the received file.',
+				description: 'Name of the binary property in which to save the binary data of the received file.',
 			},
 
 
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 039173cb3f..26e7316735 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -173,7 +173,7 @@ export class GithubTrigger implements INodeType {
 					{
 						name: 'installation',
 						value: 'installation',
-						description: 'Triggered when someone installs (created) , uninstalls (deleted), or accepts new permissions (new_permissions_accepted) for a GitHub App. When a GitHub App owner requests new permissions, the person who installed the GitHub App must accept the new permissions request.',
+						description: 'Triggered when someone installs (created), uninstalls (deleted), or accepts new permissions (new_permissions_accepted) for a GitHub App. When a GitHub App owner requests new permissions, the person who installed the GitHub App must accept the new permissions request.',
 					},
 					{
 						name: 'installation_repositories',
@@ -314,7 +314,7 @@ export class GithubTrigger implements INodeType {
 					{
 						name: 'team',
 						value: 'team',
-						description: 'Triggered when an organization\'s team is created,<br/>deleted, edited, added_to_repository, or removed_from_repository. Organization hooks only',
+						description: 'Triggered when an organization\'s team is created, deleted, edited, added_to_repository, or removed_from_repository. Organization hooks only',
 					},
 					{
 						name: 'team_add',
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
index fc4e87f804..7d593bd09b 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
@@ -323,7 +323,7 @@ export class GoogleBooks implements INodeType {
 				displayName: 'Volume Position',
 				name: 'volumePosition',
 				type: 'string',
-				description: 'Position on shelf to move the item (0 puts the item before the<br />current first item, 1 puts it between the first and the second and so on).',
+				description: 'Position on shelf to move the item (0 puts the item before the current first item, 1 puts it between the first and the second and so on).',
 				default: '',
 				required: true,
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index d107487c9c..5350752049 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -272,7 +272,7 @@ export class GoogleDrive implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 			{
 				displayName: 'Options',
@@ -739,7 +739,7 @@ export class GoogleDrive implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+				description: 'Name of the binary property which contains the data for the file to be uploaded.',
 			},
 
 			// ----------------------------------
@@ -955,7 +955,7 @@ export class GoogleDrive implements INodeType {
 						],
 					},
 				},
-				description: 'By default the response only contain the ID of the file.<br />If this option gets activated it will resolve the data automatically.',
+				description: 'By default the response only contain the ID of the file.<br />If this option gets activated, it will resolve the data automatically.',
 			},
 			{
 				displayName: 'Parents',
@@ -1059,7 +1059,7 @@ export class GoogleDrive implements INodeType {
 							},
 						},
 						default: false,
-						description: `Set to true to opt in to API behavior that aims for all items to have exactly one parent<br>
+						description: `Set to true to opt in to API behavior that aims for all items to have exactly one parent.<br>
 						This parameter only takes effect if the item is not in a shared drive`,
 					},
 					{
@@ -1631,8 +1631,8 @@ export class GoogleDrive implements INodeType {
 								name: 'adminManagedRestrictions',
 								type: 'boolean',
 								default: false,
-								description: `Whether the options to copy, print, or download files inside this shared drive,<br/>
-								should be disabled for readers and commenters. When this restriction is set to true, it will<br/>
+								description: `Whether the options to copy, print, or download files inside this shared drive,
+								should be disabled for readers and commenters. When this restriction is set to true, it will
 								override the similarly named field to true for any file inside this shared drive.`,
 							},
 							{
@@ -1640,8 +1640,8 @@ export class GoogleDrive implements INodeType {
 								name: 'copyRequiresWriterPermission',
 								type: 'boolean',
 								default: false,
-								description: `Whether the options to copy, print, or download files inside this shared drive,<br/>
-								should be disabled for readers and commenters. When this restriction is set to true, it will<br/>
+								description: `Whether the options to copy, print, or download files inside this shared drive,
+								should be disabled for readers and commenters. When this restriction is set to true, it will
 								override the similarly named field to true for any file inside this shared drive.`,
 							},
 							{
@@ -1649,8 +1649,8 @@ export class GoogleDrive implements INodeType {
 								name: 'domainUsersOnly',
 								type: 'boolean',
 								default: false,
-								description: `Whether access to this shared drive and items inside this shared drive<br/>
-								is restricted to users of the domain to which this shared drive belongs. This restriction<br/>
+								description: `Whether access to this shared drive and items inside this shared drive
+								is restricted to users of the domain to which this shared drive belongs. This restriction
 								may be overridden by other sharing policies controlled outside of this shared drive.`,
 							},
 							{
@@ -1873,8 +1873,8 @@ export class GoogleDrive implements INodeType {
 								name: 'adminManagedRestrictions',
 								type: 'boolean',
 								default: false,
-								description: `Whether the options to copy, print, or download files inside this shared drive,<br/>
-								should be disabled for readers and commenters. When this restriction is set to true, it will<br/>
+								description: `Whether the options to copy, print, or download files inside this shared drive,
+								should be disabled for readers and commenters. When this restriction is set to true, it will
 								override the similarly named field to true for any file inside this shared drive.`,
 							},
 							{
@@ -1882,8 +1882,8 @@ export class GoogleDrive implements INodeType {
 								name: 'copyRequiresWriterPermission',
 								type: 'boolean',
 								default: false,
-								description: `Whether the options to copy, print, or download files inside this shared drive,<br/>
-								should be disabled for readers and commenters. When this restriction is set to true, it will<br/>
+								description: `Whether the options to copy, print, or download files inside this shared drive,
+								should be disabled for readers and commenters. When this restriction is set to true, it will
 								override the similarly named field to true for any file inside this shared drive.`,
 							},
 							{
@@ -1891,8 +1891,8 @@ export class GoogleDrive implements INodeType {
 								name: 'domainUsersOnly',
 								type: 'boolean',
 								default: false,
-								description: `Whether access to this shared drive and items inside this shared drive<br/>
-								is restricted to users of the domain to which this shared drive belongs. This restriction<br/>
+								description: `Whether access to this shared drive and items inside this shared drive
+								is restricted to users of the domain to which this shared drive belongs. This restriction
 								may be overridden by other sharing policies controlled outside of this shared drive.`,
 							},
 							{
diff --git a/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts b/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
index ded9971f6a..3f4130f88a 100644
--- a/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
@@ -252,7 +252,7 @@ export const draftFields = [
 						],
 					},
 				},
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 			{
 				displayName: 'Format',
@@ -368,7 +368,7 @@ export const draftFields = [
 						],
 					},
 				},
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 			{
 				displayName: 'Format',
diff --git a/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
index a257985509..8760770c1c 100644
--- a/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
@@ -355,7 +355,7 @@ export const messageFields = [
 						],
 					},
 				},
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 		],
 	},
@@ -437,7 +437,7 @@ export const messageFields = [
 						],
 					},
 				},
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 			{
 				displayName: 'Format',
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
index d9aaf8f95c..a0ec5afaf0 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
@@ -201,7 +201,7 @@ export class GoogleSheets implements INodeType {
 				},
 				default: 'A:F',
 				required: true,
-				description: 'The table range to read from or to append data to. See the Google <a href="https://developers.google.com/sheets/api/guides/values#writing">documentation</a> for the details.<br />If it contains multiple sheets it can also be<br />added like this: "MySheet!A:F"',
+				description: 'The table range to read from or to append data to. See the Google <a href="https://developers.google.com/sheets/api/guides/values#writing">documentation</a> for the details.<br />If it contains multiple sheets it can also be added like this: "MySheet!A:F"',
 			},
 
 			// ----------------------------------
@@ -420,7 +420,7 @@ export class GoogleSheets implements INodeType {
 						],
 					},
 				},
-				description: 'Index of the first row which contains<br />the actual data and not the keys. Starts with 0.',
+				description: 'Index of the first row which contains the actual data and not the keys. Starts with 0.',
 			},
 
 			// ----------------------------------
@@ -518,7 +518,7 @@ export class GoogleSheets implements INodeType {
 						],
 					},
 				},
-				description: 'The name of the key to identify which<br />data should be updated in the sheet.',
+				description: 'The name of the key to identify which data should be updated in the sheet.',
 			},
 
 			{
@@ -1032,7 +1032,7 @@ export class GoogleSheets implements INodeType {
 					status: 'OK',
 					message: 'Connection successful!',
 				};
-				
+
 			},
 		},
 	};
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index 15e12367e5..afd055cfeb 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -357,7 +357,7 @@ export class GoogleSlides implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read page.',
+				description: 'Name of the binary property to which to write the data of the read page.',
 			},
 			{
 				displayName: 'Binary Property',
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
index 724bce0947..d87f412843 100644
--- a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
@@ -136,7 +136,7 @@ export class GoogleTranslate implements INodeType {
 					loadOptionsMethod: 'getLanguages',
 				},
 				default: '',
-				description: 'The language to use for translation of the input text, set to one of the<br/> language codes listed in <a href="https://cloud.google.com/translate/docs/languages">Language Support</a>',
+				description: 'The language to use for translation of the input text, set to one of the language codes listed in <a href="https://cloud.google.com/translate/docs/languages">Language Support</a>',
 				required: true,
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts b/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
index 2d49afe4f1..154c2ae0f5 100644
--- a/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
@@ -164,7 +164,7 @@ export const conversationFields = [
 				],
 			},
 		},
-		description: 'By default the response only contain the ID to resource<br />. If this option gets activated it<br />will resolve the data automatically.',
+		description: 'By default the response only contain the ID to resource. If this option gets activated, it will resolve the data automatically.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -195,7 +195,7 @@ export const conversationFields = [
 				name: 'autoReply',
 				type: 'boolean',
 				default: false,
-				description: `When autoReply is set to true, an auto reply will be sent</br>
+				description: `When autoReply is set to true, an auto reply will be sent
 				as long as there is at least one customer thread in the conversation.`,
 			},
 			{
diff --git a/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts b/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
index ff85b5fd52..52f8e6299f 100644
--- a/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
@@ -63,7 +63,7 @@ export const customerFields = [
 				],
 			},
 		},
-		description: 'By default the response only contain the ID to resource<br />. If this option gets activated it<br />will resolve the data automatically.',
+		description: 'By default the response only contain the ID to resource. If this option gets activated, it will resolve the data automatically.',
 	},
 	{
 		displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts b/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
index 35764bfc2a..bd7f2b6852 100644
--- a/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
@@ -64,6 +64,6 @@ export const cameraProxyFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 1285a141f0..b585ffb91c 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -185,7 +185,7 @@ export class HtmlExtract implements INodeType {
 								name: 'returnArray',
 								type: 'boolean',
 								default: false,
-								description: 'Returns the values as an array so if multiple ones get found they also get<br />returned separately.If not set all will be returned as a single string.',
+								description: 'Returns the values as an array so if multiple ones get found they also get returned separately. If not set all will be returned as a single string.',
 							},
 						],
 					},
@@ -204,7 +204,7 @@ export class HtmlExtract implements INodeType {
 						name: 'trimValues',
 						type: 'boolean',
 						default: true,
-						description: 'Removes automatically all spaces and newlines from<br />the beginning and end of the values.',
+						description: 'Removes automatically all spaces and newlines from the beginning and end of the values.',
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index 00765ad3b3..6048595d2f 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -228,7 +228,7 @@ export class HttpRequest implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 
 			{
@@ -1057,4 +1057,4 @@ export class HttpRequest implements INodeType {
 
 		return this.prepareOutputData(returnItems);
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
index 0eefd20ec1..1194ef7acb 100644
--- a/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
@@ -906,7 +906,7 @@ export const companyFields = [
 				name: 'propertiesWithHistory',
 				type: 'string',
 				default: '',
-				description: `Works similarly to properties=, but this parameter will include the history for the specified property,<br/>
+				description: `Works similarly to properties=, but this parameter will include the history for the specified property,
 				instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.`,
 			},
 		],
diff --git a/packages/nodes-base/nodes/Hubspot/ContactDescription.ts b/packages/nodes-base/nodes/Hubspot/ContactDescription.ts
index dbb2be43ed..764ec30411 100644
--- a/packages/nodes-base/nodes/Hubspot/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/ContactDescription.ts
@@ -88,7 +88,7 @@ export const contactFields = [
 			},
 		},
 		default: true,
-		description: 'By default the response only includes the ID. If this option gets activated it<br />will resolve the data automatically.',
+		description: 'By default the response only includes the ID. If this option gets activated, it will resolve the data automatically.',
 	},
 	{
 		displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Hubspot/DealDescription.ts b/packages/nodes-base/nodes/Hubspot/DealDescription.ts
index 11b6eb5c75..a97b7b5df5 100644
--- a/packages/nodes-base/nodes/Hubspot/DealDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/DealDescription.ts
@@ -441,7 +441,7 @@ export const dealFields = [
 				name: 'includeAssociations',
 				type: 'boolean',
 				default: false,
-				description: `Include the IDs of the associated contacts and companies in the results<br/>.
+				description: `Include the IDs of the associated contacts and companies in the results.
 				This will also automatically include the num_associated_contacts property.`,
 			},
 			{
@@ -465,7 +465,7 @@ export const dealFields = [
 					loadOptionsMethod: 'getDealProperties',
 				},
 				default: [],
-				description: `Works similarly to properties=, but this parameter will include the history for the specified property,<br/>
+				description: `Works similarly to properties=, but this parameter will include the history for the specified property,
 				instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.`,
 			},
 
diff --git a/packages/nodes-base/nodes/Hubspot/TicketDescription.ts b/packages/nodes-base/nodes/Hubspot/TicketDescription.ts
index 0836a6de4b..14beef27d8 100644
--- a/packages/nodes-base/nodes/Hubspot/TicketDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/TicketDescription.ts
@@ -443,7 +443,7 @@ export const ticketFields = [
 				name: 'propertiesWithHistory',
 				type: 'string',
 				default: '',
-				description: `Works similarly to properties=, but this parameter will include the history for the specified property,<br/>
+				description: `Works similarly to properties=, but this parameter will include the history for the specified property,
 			instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.`,
 			},
 		],
@@ -528,7 +528,7 @@ export const ticketFields = [
 				name: 'propertiesWithHistory',
 				type: 'string',
 				default: '',
-				description: `Works similarly to properties=, but this parameter will include the history for the specified property,<br/>
+				description: `Works similarly to properties=, but this parameter will include the history for the specified property,
 			instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.`,
 			},
 		],
diff --git a/packages/nodes-base/nodes/ICalendar.node.ts b/packages/nodes-base/nodes/ICalendar.node.ts
index 98883d9b1e..b802664102 100644
--- a/packages/nodes-base/nodes/ICalendar.node.ts
+++ b/packages/nodes-base/nodes/ICalendar.node.ts
@@ -83,7 +83,7 @@ export class ICalendar implements INodeType {
 				type: 'string',
 				default: 'data',
 				required: true,
-				description: 'The field that your iCalendar file will be<br />available under in the output.',
+				description: 'The field that your iCalendar file will be available under in the output.',
 			},
 			{
 				displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
index 77b6bb6c3a..2db69e1fcf 100644
--- a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
@@ -371,7 +371,7 @@ export const companyFields = [
 				name: 'website',
 				type: 'string',
 				default: '',
-				description: `The URL for this company's website. Please note that the value<br />specified here is not validated. Accepts any string.`,
+				description: `The URL for this company's website. Please note that the value specified here is not validated. Accepts any string.`,
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Intercom/LeadDescription.ts b/packages/nodes-base/nodes/Intercom/LeadDescription.ts
index de41a9cf7a..11d1a7bdb4 100644
--- a/packages/nodes-base/nodes/Intercom/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/LeadDescription.ts
@@ -403,7 +403,7 @@ export const leadFields = [
 				name: 'updateLastRequestAt',
 				type: 'boolean',
 				default: false,
-				description: 'A boolean value, which if true, instructs Intercom to update the<br />users last_request_at value to the current API service time in<br />UTC. default value if not sent is false.',
+				description: 'A boolean value, which if true, instructs Intercom to update the users last_request_at value to the current API service time in UTC. default value if not sent is false.',
 			},
 			{
 				displayName: 'UTM Campaign',
diff --git a/packages/nodes-base/nodes/Intercom/UserDescription.ts b/packages/nodes-base/nodes/Intercom/UserDescription.ts
index f446205e2d..d6c2fd68a9 100644
--- a/packages/nodes-base/nodes/Intercom/UserDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/UserDescription.ts
@@ -456,7 +456,7 @@ export const userFields = [
 				type: 'boolean',
 				default: false,
 				options: [],
-				description: 'A boolean value, which if true, instructs Intercom to update the users<br />last_request_at value to the current API service time in UTC.',
+				description: 'A boolean value, which if true, instructs Intercom to update the users last_request_at value to the current API service time in UTC.',
 			},
 			{
 				displayName: 'UTM Campaign',
diff --git a/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts b/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
index 7b4980e20e..bfb66303da 100644
--- a/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
@@ -151,7 +151,7 @@ export const issueCommentFields = [
 					},
 				],
 				default: '',
-				description: 'Use expand to include additional information about comments<br />in the response. This parameter accepts Rendered Body, which<br />returns the comment body rendered in HTML.',
+				description: 'Use expand to include additional information about comments in the response. This parameter accepts Rendered Body, which returns the comment body rendered in HTML.',
 			},
 		],
 	},
@@ -222,7 +222,7 @@ export const issueCommentFields = [
 					},
 				],
 				default: '',
-				description: 'Use expand to include additional information about comments in<br />the response. This parameter accepts Rendered Body, which<br />returns the comment body rendered in HTML.',
+				description: 'Use expand to include additional information about comments in the response. This parameter accepts Rendered Body, which returns the comment body rendered in HTML.',
 			},
 		],
 	},
@@ -317,7 +317,7 @@ export const issueCommentFields = [
 					},
 				],
 				default: '',
-				description: 'Use expand to include additional information about comments in the<br />response. This parameter accepts Rendered Body, which returns the comment<br />body rendered in HTML.',
+				description: 'Use expand to include additional information about comments in the response. This parameter accepts Rendered Body, which returns the comment body rendered in HTML.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Jira/IssueDescription.ts b/packages/nodes-base/nodes/Jira/IssueDescription.ts
index 64b5497ac4..d8acd74384 100644
--- a/packages/nodes-base/nodes/Jira/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueDescription.ts
@@ -268,7 +268,7 @@ export const issueFields = [
 				name: 'updateHistory',
 				type: 'boolean',
 				default: false,
-				description: `Whether the project in which the issue is created is added to the user's<br/>
+				description: `Whether the project in which the issue is created is added to the user's
 				Recently viewed project list, as shown under Projects in Jira.`,
 			},
 		],
@@ -546,7 +546,7 @@ export const issueFields = [
 				transitions Returns all possible transitions for the issue.<br/>
 				editmeta Returns information about how each field can be edited.<br/>
 				changelog Returns a list of recent updates to an issue, sorted by date, starting from the most recent.<br/>
-				versionedRepresentations Returns a JSON array for each version of a field's value, with the highest number<br/>
+				versionedRepresentations Returns a JSON array for each version of a field's value, with the highest number
 				representing the most recent version. Note: When included in the request, the fields parameter is ignored.`,
 			},
 			{
@@ -567,7 +567,7 @@ export const issueFields = [
 				type: 'boolean',
 				default: false,
 				description: `Indicates whether fields in fields are referenced by keys rather than IDs.<br/>
-				This parameter is useful where fields have been added by a connect app and a field's key<br/>
+				This parameter is useful where fields have been added by a connect app and a field's key
 				may differ from its ID.`,
 			},
 			{
@@ -723,7 +723,7 @@ export const issueFields = [
 				type: 'boolean',
 				default: false,
 				description: `Indicates whether fields in fields are referenced by keys rather than IDs.<br/>
-				This parameter is useful where fields have been added by a connect app and a field's key<br/>
+				This parameter is useful where fields have been added by a connect app and a field's key
 				may differ from its ID.`,
 			},
 			{
@@ -1111,8 +1111,8 @@ export const issueFields = [
 				type: 'string',
 				default: '',
 				description: `Use expand to include additional information about transitions in the response.<br/>
-				 This parameter accepts transitions.fields, which returns information about the fields in the<br/>
-				 transition screen for each transition. Fields hidden from the screen are not returned. Use this<br/>
+				 This parameter accepts transitions.fields, which returns information about the fields in the
+				 transition screen for each transition. Fields hidden from the screen are not returned. Use this
 				 information to populate the fields and update fields in Transition issue.`,
 			},
 			{
@@ -1127,7 +1127,7 @@ export const issueFields = [
 				name: 'skipRemoteOnlyCondition',
 				type: 'boolean',
 				default: false,
-				description: `Indicates whether transitions with the condition Hide<br/>
+				description: `Indicates whether transitions with the condition Hide
 				From User Condition are included in the response.`,
 			},
 		],
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index b118379a04..00fc519753 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -69,7 +69,7 @@ export class JotFormTrigger implements INodeType {
 				name: 'resolveData',
 				type: 'boolean',
 				default: true,
-				description: 'By default does the webhook-data use internal keys instead of the names.<br />If this option gets activated it will resolve the keys automatically to the actual names.',
+				description: 'By default does the webhook-data use internal keys instead of the names.<br />If this option gets activated, it will resolve the keys automatically to the actual names.',
 			},
 			{
 				displayName: 'Only Answers',
diff --git a/packages/nodes-base/nodes/Keap/FileDescription.ts b/packages/nodes-base/nodes/Keap/FileDescription.ts
index b030170c6f..7038c99850 100644
--- a/packages/nodes-base/nodes/Keap/FileDescription.ts
+++ b/packages/nodes-base/nodes/Keap/FileDescription.ts
@@ -76,7 +76,7 @@ export const fileFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+		description: 'Name of the binary property which contains the data for the file to be uploaded.',
 	},
 	{
 		displayName: 'File Association',
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
index 8740026919..2e89bafd7b 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
@@ -77,7 +77,7 @@ export class LingvaNex implements INodeType {
 					loadOptionsMethod: 'getLanguages',
 				},
 				default: '',
-				description: 'The language to use for translation of the input text, set to one of the<br/> language codes listed in <a href="https://cloud.google.com/translate/docs/languages">Language Support</a>',
+				description: 'The language to use for translation of the input text, set to one of the language codes listed in <a href="https://cloud.google.com/translate/docs/languages">Language Support</a>',
 				required: true,
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index 56c0780246..e96b579e09 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -1210,7 +1210,7 @@ export class Mailchimp implements INodeType {
 						name: 'skipMergeValidation',
 						type: 'boolean',
 						default: false,
-						description: `If skip_merge_validation is true, member data will be accepted without merge field values,<br/>
+						description: `If skip_merge_validation is true, member data will be accepted without merge field values,
 						even if the merge field is usually required`,
 					},
 					{
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index fe9d338921..fe741c638b 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -101,7 +101,7 @@ export class Mailgun implements INodeType {
 				name: 'attachments',
 				type: 'string',
 				default: '',
-				description: 'Name of the binary properties which contain<br />data which should be added to email as attachment.<br />Multiple ones can be comma separated.',
+				description: 'Name of the binary properties which contain data which should be added to email as attachment.<br />Multiple ones can be comma separated.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index f2a73cafe4..9304235753 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -247,21 +247,21 @@ export class Mandrill implements INodeType {
 						name: 'async',
 						type: 'boolean',
 						default: false,
-						description: `Enable a background sending mode that is optimized for bulk sending.<br />In async mode, messages/send will immediately return a status of "queued"<br />for every recipient. To handle rejections when sending in async mode, set up<br />a webhook for the 'reject' event. Defaults to false for messages with<br />no more than 10 recipients; messages with more than 10 recipients are always sent<br />asynchronously, regardless of the value of async.`,
+						description: `Enable a background sending mode that is optimized for bulk sending.<br />In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.`,
 					},
 					{
 						displayName: 'Auto Text',
 						name: 'autoText',
 						type: 'boolean',
 						default: false,
-						description: 'Whether or not to automatically generate a text<br />part for messages that are not given text.',
+						description: 'Whether or not to automatically generate a text part for messages that are not given text.',
 					},
 					{
 						displayName: 'Auto HTML',
 						name: 'autoHtml',
 						type: 'boolean',
 						default: false,
-						description: 'Whether or not to automatically generate an HTML<br />part for messages that are not given HTML.',
+						description: 'Whether or not to automatically generate an HTML part for messages that are not given HTML.',
 					},
 					{
 						displayName: 'BCC Address',
@@ -293,7 +293,7 @@ export class Mandrill implements INodeType {
 						type: 'string',
 						default: '',
 						placeholder: '',
-						description: `An array of strings separated by , indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.`,
+						description: `An array of strings separated by a comma (,) indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.`,
 					},
 					{
 						displayName: 'HTML',
@@ -311,14 +311,14 @@ export class Mandrill implements INodeType {
 						name: 'important',
 						type: 'boolean',
 						default: false,
-						description: 'Whether or not this message is important, and should be<br />delivered ahead of non-important messages.',
+						description: 'Whether or not this message is important, and should be delivered ahead of non-important messages.',
 					},
 					{
 						displayName: 'Inline CSS',
 						name: 'inlineCss',
 						type: 'boolean',
 						default: false,
-						description: 'Whether or not to automatically inline all CSS styles provided in<br />the message HTML - only for HTML documents less than 256KB in size.',
+						description: 'Whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size.',
 					},
 					{
 						displayName: 'Ip Pool',
@@ -349,7 +349,7 @@ export class Mandrill implements INodeType {
 						type: 'dateTime',
 						default: '',
 						placeholder: '',
-						description: `When this message should be sent as a UTC timestamp in<br />YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message<br />will be sent immediately. An additional fee applies for scheduled email,<br />and this feature is only available to accounts with a positive balance.`,
+						description: `When this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.`,
 					},
 					{
 						displayName: 'Signing Domain',
@@ -357,7 +357,7 @@ export class Mandrill implements INodeType {
 						type: 'string',
 						default: '',
 						placeholder: '',
-						description: `A custom domain to use for SPF/DKIM signing instead of<br />mandrill(for "via" or "on behalf of" in email clients).`,
+						description: `A custom domain to use for SPF/DKIM signing instead of mandrill(for "via" or "on behalf of" in email clients).`,
 					},
 					{
 						displayName: 'Subaccount',
@@ -381,7 +381,7 @@ export class Mandrill implements INodeType {
 						type: 'string',
 						default: '',
 						placeholder: '',
-						description: `An array of string separated by , to tag the message with. Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently. Tags should be 50 characters or less. Any tags starting with an underscore are reserved for internal use and will cause errors.`,
+						description: `An array of string separated by a comma (,) to tag the message with. Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently. Tags should be 50 characters or less. Any tags starting with an underscore are reserved for internal use and will cause errors.`,
 					},
 					{
 						displayName: 'Text',
@@ -421,7 +421,7 @@ export class Mandrill implements INodeType {
 						name: 'urlStripQs',
 						type: 'boolean',
 						default: false,
-						description: 'Whether or not to strip the query string from<br />URLs when aggregating tracked URL data.',
+						description: 'Whether or not to strip the query string from URLs when aggregating tracked URL data.',
 					},
 					{
 						displayName: 'View Content Link',
@@ -508,7 +508,7 @@ export class Mandrill implements INodeType {
 						],
 					},
 				},
-				description: 'Metadata an associative array of user metadata. Mandrill will store<br />this metadata and make it available for retrieval. In addition, you can select<br />up to 10 metadata fields to index and make searchable using the Mandrill search api.',
+				description: 'Metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.',
 				options: [
 					{
 						name: 'metadataValues',
@@ -549,7 +549,7 @@ export class Mandrill implements INodeType {
 				placeholder: `{
 	"website": "www.example.com"
 }`,
-				description: 'Metadata an associative array of user metadata. Mandrill will store this metadata<br />and make it available for retrieval. In addition, you can select up to<br />10 metadata fields to index and make searchable using the Mandrill search api.',
+				description: 'Metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.',
 			},
 			{
 				displayName: 'Attachments',
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/description.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/description.ts
index 1876e916c0..4570484d0c 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/description.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/description.ts
@@ -65,7 +65,7 @@ export const channelMembersDescription: ChannelProperties = [
 			},
 		},
 		default: true,
-		description: 'By default the response only contain the ID of the user.<br />If this option gets activated it will resolve the user automatically.',
+		description: 'By default the response only contain the ID of the user.<br />If this option gets activated, it will resolve the user automatically.',
 	},
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/Mautic/ContactDescription.ts b/packages/nodes-base/nodes/Mautic/ContactDescription.ts
index 3f7d0d06fc..a1aa9f75d6 100644
--- a/packages/nodes-base/nodes/Mautic/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Mautic/ContactDescription.ts
@@ -1233,7 +1233,7 @@ export const contactFields = [
 				name: 'rawData',
 				type: 'boolean',
 				default: true,
-				description: `By default only the data of the fields get returned. If this<br />
+				description: `By default only the data of the fields get returned. If this
 							  options gets set the RAW response with all data gets returned.`,
 			},
 		],
diff --git a/packages/nodes-base/nodes/Merge.node.ts b/packages/nodes-base/nodes/Merge.node.ts
index a6cb8ab4f7..07b103f484 100644
--- a/packages/nodes-base/nodes/Merge.node.ts
+++ b/packages/nodes-base/nodes/Merge.node.ts
@@ -104,7 +104,7 @@ export class Merge implements INodeType {
 					},
 				],
 				default: 'left',
-				description: 'How many items the output will contain<br />if inputs contain different amount of items.',
+				description: 'How many items the output will contain if inputs contain different amount of items.',
 			},
 			{
 				displayName: 'Property Input 1',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
index 2820161531..82a966d790 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
@@ -244,7 +244,7 @@ export const worksheetFields = [
 				],
 			},
 		},
-		description: 'Index of the first row which contains<br />the actual data and not the keys. Starts with 0.',
+		description: 'Index of the first row which contains the actual data and not the keys. Starts with 0.',
 	},
 	{
 		displayName: 'Key Row',
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
index 97d647027a..b723a55540 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
@@ -236,7 +236,7 @@ export const fileFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 file:get                                   */
@@ -457,6 +457,6 @@ export const fileFields = [
 
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains<br />the data for the file.',
+		description: 'Name of the binary property which contains the data for the file.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
index 8c4e42dcc9..a7973d4610 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
@@ -29,7 +29,7 @@ export const draftMessageSharedFields = [
 				name: 'dataPropertyAttachmentsPrefixName',
 				type: 'string',
 				default: 'attachment_',
-				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
+				description: 'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
 			{
 				displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts
index 61b375f63f..46e85d52d8 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts
@@ -133,7 +133,7 @@ export const messageAttachmentFields = [
 	{
 		displayName: 'Binary Property',
 		name: 'binaryPropertyName',
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 		type: 'string',
 		required: true,
 		default: 'data',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
index e67b6ce3ea..7eeafd2676 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
@@ -601,7 +601,7 @@ export const messageFields = [
 	{
 		displayName: 'Binary Property',
 		name: 'binaryPropertyName',
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 		type: 'string',
 		required: true,
 		default: 'data',
diff --git a/packages/nodes-base/nodes/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData.node.ts
index 011812a5e0..dab5fd5f62 100644
--- a/packages/nodes-base/nodes/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData.node.ts
@@ -93,7 +93,7 @@ export class MoveBinaryData implements INodeType {
 					},
 				},
 				default: true,
-				description: 'If all JSON data should be replaced with the data retrieved<br />from binary key. Else the data will be written to a single key.',
+				description: 'If all JSON data should be replaced with the data retrieved from binary key. Else the data will be written to a single key.',
 			},
 			{
 				displayName: 'Source Key',
@@ -128,7 +128,7 @@ export class MoveBinaryData implements INodeType {
 				default: 'data',
 				required: true,
 				placeholder: '',
-				description: 'The name the JSON key to copy data to. It is also possible<br />to define deep keys by using dot-notation like for example:<br />"level1.level2.newKey"',
+				description: 'The name the JSON key to copy data to. It is also possible to define deep keys by using dot-notation like for example:<br />"level1.level2.newKey"',
 			},
 
 			// ----------------------------------
@@ -165,7 +165,7 @@ export class MoveBinaryData implements INodeType {
 				default: 'data',
 				required: true,
 				placeholder: 'data',
-				description: 'The name of the JSON key to get data from. It is also possible<br />to define deep keys by using dot-notation like for example:<br />"level1.level2.currentKey"',
+				description: 'The name of the JSON key to get data from. It is also possible to define deep keys by using dot-notation like for example:<br />"level1.level2.currentKey"',
 			},
 			{
 				displayName: 'Destination Key',
@@ -181,7 +181,7 @@ export class MoveBinaryData implements INodeType {
 				default: 'data',
 				required: true,
 				placeholder: 'data',
-				description: 'The name the binary key to copy data to. It is also possible<br />to define deep keys by using dot-notation like for example:<br />"level1.level2.newKey"',
+				description: 'The name the binary key to copy data to. It is also possible to define deep keys by using dot-notation like for example:<br />"level1.level2.newKey"',
 			},
 
 			{
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 455d724a44..3e163bedcb 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -395,7 +395,7 @@ export class NextCloud implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 
 			// ----------------------------------
@@ -481,7 +481,7 @@ export class NextCloud implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+				description: 'Name of the binary property which contains the data for the file to be uploaded.',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/PayPal/PaymentDescription.ts b/packages/nodes-base/nodes/PayPal/PaymentDescription.ts
index 692729db24..1881702ae0 100644
--- a/packages/nodes-base/nodes/PayPal/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/PayPal/PaymentDescription.ts
@@ -127,7 +127,7 @@ export const payoutFields = [
 						type: 'string',
 						required: true,
 						default: '',
-						description: 'The receiver of the payment. Corresponds to the recipient_type value<br />in the request. Max length: 127 characters.',
+						description: 'The receiver of the payment. Corresponds to the recipient_type value in the request. Max length: 127 characters.',
 					},
 					{
 						displayName: 'Currency',
@@ -180,7 +180,7 @@ export const payoutFields = [
 						type: 'string',
 						required: false,
 						default: '',
-						description: 'The sender-specified note for notifications. Supports up to<br />4000 ASCII characters and 1000 non-ASCII characters.',
+						description: 'The sender-specified note for notifications. Supports up to 4000 ASCII characters and 1000 non-ASCII characters.',
 					},
 					{
 						displayName: 'Sender Item ID',
@@ -256,14 +256,14 @@ export const payoutFields = [
 				name: 'emailSubject',
 				type: 'string',
 				default: '',
-				description: 'The subject line for the email that PayPal sends when payment<br />for a payout item completes. The subject line is the same for all<br />recipients. Max length: 255 characters.',
+				description: 'The subject line for the email that PayPal sends when payment for a payout item completes. The subject line is the same for all recipients. Max length: 255 characters.',
 			},
 			{
 				displayName: 'Email Message',
 				name: 'emailMessage',
 				type: 'string',
 				default: '',
-				description: 'The email message that PayPal sends when the payout item completes.<br />The message is the same for all recipients.',
+				description: 'The email message that PayPal sends when the payout item completes. The message is the same for all recipients.',
 			},
 			{
 				displayName: 'Note',
diff --git a/packages/nodes-base/nodes/Phantombuster/AgentDescription.ts b/packages/nodes-base/nodes/Phantombuster/AgentDescription.ts
index 99f5c87dc1..2c97ef422f 100644
--- a/packages/nodes-base/nodes/Phantombuster/AgentDescription.ts
+++ b/packages/nodes-base/nodes/Phantombuster/AgentDescription.ts
@@ -176,7 +176,7 @@ export const agentFields = [
 				],
 			},
 		},
-		description: 'By default the outpout is presented as string. If this option gets activated it<br />will resolve the data automatically.',
+		description: 'By default the outpout is presented as string. If this option gets activated, it will resolve the data automatically.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -283,7 +283,7 @@ export const agentFields = [
 				],
 			},
 		},
-		description: 'By default the launch just include the container ID. If this option gets activated it<br />will resolve the data automatically.',
+		description: 'By default the launch just include the container ID. If this option gets activated, it will resolve the data automatically.',
 	},
 	{
 		displayName: 'JSON Parameters',
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index c0956012d1..66d135f5b5 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -2001,7 +2001,7 @@ export class Pipedrive implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be created.',
+				description: 'Name of the binary property which contains the data for the file to be created.',
 			},
 			{
 				displayName: 'Additional Fields',
@@ -2120,7 +2120,7 @@ export class Pipedrive implements INodeType {
 						],
 					},
 				},
-				description: 'Name of the binary property to which to<br />write the data of the downloaded file.',
+				description: 'Name of the binary property to which to write the data of the downloaded file.',
 			},
 
 			// ----------------------------------
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 1e57ab093c..69654265b9 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -208,7 +208,7 @@ export class Pushbullet implements INodeType {
 					},
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be created.',
+				description: 'Name of the binary property which contains the data for the file to be created.',
 			},
 			{
 				displayName: 'Target',
diff --git a/packages/nodes-base/nodes/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
index e84f19a023..b378f97221 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
@@ -41,7 +41,7 @@ export class ReadBinaryFile implements INodeType {
 				type: 'string',
 				default: 'data',
 				required: true,
-				description: 'Name of the binary property to which to<br />write the data of the read file.',
+				description: 'Name of the binary property to which to write the data of the read file.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
index af7b3f9b12..8025c177a4 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
@@ -42,7 +42,7 @@ export class ReadBinaryFiles implements INodeType {
 				type: 'string',
 				default: 'data',
 				required: true,
-				description: 'Name of the binary property to which to<br />write the data of the read files.',
+				description: 'Name of the binary property to which to write the data of the read files.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/ReadPdf.node.ts b/packages/nodes-base/nodes/ReadPdf.node.ts
index c4e1ee0972..fbef80a90f 100644
--- a/packages/nodes-base/nodes/ReadPdf.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf.node.ts
@@ -32,7 +32,7 @@ export class ReadPdf implements INodeType {
 				type: 'string',
 				default: 'data',
 				required: true,
-				description: 'Name of the binary property from which to<br />read the PDF file.',
+				description: 'Name of the binary property from which to read the PDF file.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
index fc2ed3509a..624fe18128 100644
--- a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
@@ -1,4 +1,4 @@
-import { 
+import {
 	INodeProperties,
 } from 'n8n-workflow';
 
@@ -109,7 +109,7 @@ export const attachmentFields = [
 			},
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+		description: 'Name of the binary property which contains the data for the file to be uploaded.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -199,7 +199,7 @@ export const attachmentFields = [
 				type: 'string',
 				default: 'data',
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+				description: 'Name of the binary property which contains the data for the file to be uploaded.',
 			},
 			{
 				displayName: 'Description',
diff --git a/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts b/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
index a0a3671304..901f429a13 100644
--- a/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
@@ -66,7 +66,7 @@ export const documentFields = [
 			},
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+		description: 'Name of the binary property which contains the data for the file to be uploaded.',
 	},
 	{
 		displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Salesforce/TaskDescription.ts b/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
index a3d4a294e5..d0a15ad5c1 100644
--- a/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
@@ -100,7 +100,7 @@ export const taskFields = [
 				type: 'dateTime',
 				default: '',
 				description: `Represents the due date of the task.<br/>
-				This field has a timestamp that is always set to midnight <br/>
+				This field has a timestamp that is always set to midnight
 				in the Coordinated Universal Time (UTC) time zone.`,
 			},
 			{
@@ -111,8 +111,8 @@ export const taskFields = [
 					alwaysOpenEditWindow: true,
 				},
 				default: '',
-				description: `Represents the result of a given call, for example, “we'll call back,” or “call<br/>
-				 unsuccessful.” Limit is 255 characters. Not subject to field-level security, available for any user<br/>
+				description: `Represents the result of a given call, for example, “we'll call back,” or “call
+				 unsuccessful.” Limit is 255 characters. Not subject to field-level security, available for any user
 				  in an organization with Salesforce CRM Call Center.`,
 			},
 			{
@@ -120,7 +120,7 @@ export const taskFields = [
 				name: 'callDurationInSeconds',
 				type: 'number',
 				default: '',
-				description: `Duration of the call in seconds. Not subject to field-level security,<br/>
+				description: `Duration of the call in seconds. Not subject to field-level security,
 				 available for any user in an organization with Salesforce CRM Call Center`,
 			},
 			{
@@ -132,7 +132,7 @@ export const taskFields = [
 				},
 				default: '',
 				description: `Name of a call center. Limit is 255 characters. <br/>
-				Not subject to field-level security, available for any user in an <br/>
+				Not subject to field-level security, available for any user in an
 				organization with Salesforce CRM Call Center.`,
 			},
 			{
@@ -257,9 +257,9 @@ export const taskFields = [
 				name: 'recurrenceDayOfWeekMask',
 				type: 'number',
 				default: '',
-				description: `The day or days of the week on which the task repeats.<br/>
-				This field contains a bitmask. The values are as follows: Sunday = 1 Monday = 2<br/>
-				Tuesday = 4 Wednesday = 8 Thursday = 16 Friday = 32 Saturday = 64<br/>
+				description: `The day or days of the week on which the task repeats.
+				This field contains a bitmask. The values are as follows: Sunday = 1 Monday = 2
+				Tuesday = 4 Wednesday = 8 Thursday = 16 Friday = 32 Saturday = 64
 				Multiple days are represented as the sum of their numerical values.<br/>
 				For example, Tuesday and Thursday = 4 + 16 = 20.`,
 			},
@@ -268,7 +268,7 @@ export const taskFields = [
 				name: 'recurrenceEndDateOnly',
 				type: 'dateTime',
 				default: '',
-				description: `The last date on which the task repeats. This field has a timestamp that<br/>
+				description: `The last date on which the task repeats. This field has a timestamp that
 				is always set to midnight in the Coordinated Universal Time (UTC) time zone.`,
 			},
 			{
@@ -348,8 +348,8 @@ export const taskFields = [
 					},
 				],
 				description: `Represents what triggers a repeating task to repeat.<br/>
-				 Add this field to a page layout together with the RecurrenceInterval field,<br/>
-				  which determines the number of days between the triggering date (due date or close date)<br/>
+				 Add this field to a page layout together with the RecurrenceInterval field,
+				  which determines the number of days between the triggering date (due date or close date)
 				  and the due date of the next repeating task in the series.Label is Repeat This Task.`,
 			},
 			{
@@ -373,9 +373,9 @@ export const taskFields = [
 				name: 'reminderDateTime',
 				type: 'dateTime',
 				default: '',
-				description: `Represents the time when the reminder is scheduled to fire,<br/>
-				if IsReminderSet is set to true. If IsReminderSet is set to false, then the<br/>
-				 user may have deselected the reminder checkbox in the Salesforce user interface,<br/>
+				description: `Represents the time when the reminder is scheduled to fire,
+				if IsReminderSet is set to true. If IsReminderSet is set to false, then the
+				 user may have deselected the reminder checkbox in the Salesforce user interface,
 				 or the reminder has already fired at the time indicated by the value.`,
 			},
 			{
@@ -403,8 +403,8 @@ export const taskFields = [
 				name: 'whatId',
 				type: 'string',
 				default: '',
-				description: `The WhatId represents nonhuman objects such as accounts, opportunities,<br/>
-				campaigns, cases, or custom objects. WhatIds are polymorphic. Polymorphic means a<br/>
+				description: `The WhatId represents nonhuman objects such as accounts, opportunities,
+				campaigns, cases, or custom objects. WhatIds are polymorphic. Polymorphic means a
 				WhatId is equivalent to the ID of a related object.`,
 			},
 			{
@@ -473,8 +473,8 @@ export const taskFields = [
 					alwaysOpenEditWindow: true,
 				},
 				default: '',
-				description: `Represents the result of a given call, for example, “we'll call back,” or “call<br/>
-				 unsuccessful.” Limit is 255 characters. Not subject to field-level security, available for any user<br/>
+				description: `Represents the result of a given call, for example, “we'll call back,” or “call
+				 unsuccessful.” Limit is 255 characters. Not subject to field-level security, available for any user
 				  in an organization with Salesforce CRM Call Center.`,
 			},
 			{
@@ -482,7 +482,7 @@ export const taskFields = [
 				name: 'callDurationInSeconds',
 				type: 'number',
 				default: '',
-				description: `Duration of the call in seconds. Not subject to field-level security,<br/>
+				description: `Duration of the call in seconds. Not subject to field-level security,
 				 available for any user in an organization with Salesforce CRM Call Center`,
 			},
 			{
@@ -494,7 +494,7 @@ export const taskFields = [
 				},
 				default: '',
 				description: `Name of a call center. Limit is 255 characters. <br/>
-				Not subject to field-level security, available for any user in an <br/>
+				Not subject to field-level security, available for any user in an
 				organization with Salesforce CRM Call Center.`,
 			},
 			{
@@ -613,8 +613,8 @@ export const taskFields = [
 				type: 'number',
 				default: '',
 				description: `The day or days of the week on which the task repeats.<br/>
-				This field contains a bitmask. The values are as follows: Sunday = 1 Monday = 2<br/>
-				Tuesday = 4 Wednesday = 8 Thursday = 16 Friday = 32 Saturday = 64<br/>
+				This field contains a bitmask. The values are as follows: Sunday = 1 Monday = 2
+				Tuesday = 4 Wednesday = 8 Thursday = 16 Friday = 32 Saturday = 64
 				Multiple days are represented as the sum of their numerical values.<br/>
 				For example, Tuesday and Thursday = 4 + 16 = 20.`,
 			},
@@ -623,7 +623,7 @@ export const taskFields = [
 				name: 'recurrenceEndDateOnly',
 				type: 'dateTime',
 				default: '',
-				description: `The last date on which the task repeats. This field has a timestamp that<br/>
+				description: `The last date on which the task repeats. This field has a timestamp that
 				is always set to midnight in the Coordinated Universal Time (UTC) time zone.`,
 			},
 			{
@@ -728,8 +728,8 @@ export const taskFields = [
 					},
 				],
 				description: `Represents what triggers a repeating task to repeat.<br/>
-				 Add this field to a page layout together with the RecurrenceInterval field,<br/>
-				  which determines the number of days between the triggering date (due date or close date)<br/>
+				 Add this field to a page layout together with the RecurrenceInterval field,
+				  which determines the number of days between the triggering date (due date or close date)
 				  and the due date of the next repeating task in the series.Label is Repeat This Task.`,
 			},
 			{
@@ -755,9 +755,9 @@ export const taskFields = [
 				name: 'reminderDateTime',
 				type: 'dateTime',
 				default: '',
-				description: `Represents the time when the reminder is scheduled to fire,<br/>
-				if IsReminderSet is set to true. If IsReminderSet is set to false, then the<br/>
-				 user may have deselected the reminder checkbox in the Salesforce user interface,<br/>
+				description: `Represents the time when the reminder is scheduled to fire,
+				if IsReminderSet is set to true. If IsReminderSet is set to false, then the
+				 user may have deselected the reminder checkbox in the Salesforce user interface,
 				 or the reminder has already fired at the time indicated by the value.`,
 			},
 			{
@@ -775,8 +775,8 @@ export const taskFields = [
 				name: 'whatId',
 				type: 'string',
 				default: '',
-				description: `The WhatId represents nonhuman objects such as accounts, opportunities,<br/>
-				campaigns, cases, or custom objects. WhatIds are polymorphic. Polymorphic means a<br/>
+				description: `The WhatId represents nonhuman objects such as accounts, opportunities,
+				campaigns, cases, or custom objects. WhatIds are polymorphic. Polymorphic means a
 				WhatId is equivalent to the ID of a related object.`,
 			},
 			{
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
index 332137bff5..9501d66a05 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
@@ -378,6 +378,6 @@ export const reportFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Set.node.ts b/packages/nodes-base/nodes/Set.node.ts
index 01cd0ff8f0..aa61b34df1 100644
--- a/packages/nodes-base/nodes/Set.node.ts
+++ b/packages/nodes-base/nodes/Set.node.ts
@@ -29,7 +29,7 @@ export class Set implements INodeType {
 				name: 'keepOnlySet',
 				type: 'boolean',
 				default: false,
-				description: 'If only the values set on this node should be<br />kept and all others removed.',
+				description: 'If only the values set on this node should be kept and all others removed.',
 			},
 			{
 				displayName: 'Values to Set',
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index 34fa8497f3..354f150f5b 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -165,8 +165,8 @@ export class Signl4 implements INodeType {
 						name: 'externalId',
 						type: 'string',
 						default: '',
-						description: `If the event originates from a record in a 3rd party system, use this parameter to pass <br/>
-						the unique ID of that record. That ID will be communicated in outbound webhook notifications from SIGNL4,<br/>
+						description: `If the event originates from a record in a 3rd party system, use this parameter to pass
+						the unique ID of that record. That ID will be communicated in outbound webhook notifications from SIGNL4,
 						which is great for correlation/synchronization of that record with the alert.<br/>
 						If you resolve / close an alert you must use the same External ID as in the original alert.`,
 					},
@@ -176,7 +176,7 @@ export class Signl4 implements INodeType {
 						type: 'boolean',
 						default: 'false',
 						description: `Specify a boolean value of true or false to apply event filtering for this event, or not. <br/>
-						If set to true, the event will only trigger a notification to the team, if it contains at least one keyword <br/>
+						If set to true, the event will only trigger a notification to the team, if it contains at least one keyword
 						from one of your services and system categories (i.e. it is whitelisted)`,
 					},
 					{
@@ -243,8 +243,8 @@ export class Signl4 implements INodeType {
 						],
 					},
 				},
-				description: `If the event originates from a record in a 3rd party system, use this parameter to pass <br/>
-				the unique ID of that record. That ID will be communicated in outbound webhook notifications from SIGNL4,<br/>
+				description: `If the event originates from a record in a 3rd party system, use this parameter to pass
+				the unique ID of that record. That ID will be communicated in outbound webhook notifications from SIGNL4,
 				which is great for correlation/synchronization of that record with the alert.<br/>
 				If you resolve / close an alert you must use the same External ID as in the original alert.`,
 			},
diff --git a/packages/nodes-base/nodes/Slack/ChannelDescription.ts b/packages/nodes-base/nodes/Slack/ChannelDescription.ts
index 2dbf1059e8..ba49482675 100644
--- a/packages/nodes-base/nodes/Slack/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Slack/ChannelDescription.ts
@@ -674,7 +674,7 @@ export const channelFields = [
 				],
 			},
 		},
-		description: 'By default the response only contain the ID to resource. If this<br />option gets activated it will resolve the data automatically.',
+		description: 'By default the response only contain the ID to resource. If this option gets activated, it will resolve the data automatically.',
 	},
 
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Slack/FileDescription.ts b/packages/nodes-base/nodes/Slack/FileDescription.ts
index 73c73682b6..2ef166a694 100644
--- a/packages/nodes-base/nodes/Slack/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/FileDescription.ts
@@ -99,7 +99,7 @@ export const fileFields = [
 
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+		description: 'Name of the binary property which contains the data for the file to be uploaded.',
 	},
 	{
 		displayName: 'Options',
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index fcf972de63..3406ebedc3 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -103,7 +103,7 @@ export class SpreadsheetFile implements INodeType {
 
 				},
 				placeholder: '',
-				description: 'Name of the binary property from which to read<br />the binary data of the spreadsheet file.',
+				description: 'Name of the binary property from which to read the binary data of the spreadsheet file.',
 			},
 
 			// ----------------------------------
@@ -169,7 +169,7 @@ export class SpreadsheetFile implements INodeType {
 					},
 				},
 				placeholder: '',
-				description: 'Name of the binary property in which to save<br />the binary data of the spreadsheet file.',
+				description: 'Name of the binary property in which to save the binary data of the spreadsheet file.',
 			},
 
 			{
@@ -265,7 +265,7 @@ export class SpreadsheetFile implements INodeType {
 							},
 						},
 						default: false,
-						description: 'In some cases and file formats, it is necessary to read<br />specifically as string else some special character get interpreted wrong.',
+						description: 'In some cases and file formats, it is necessary to read specifically as string else some special character get interpreted wrong.',
 					},
 					{
 						displayName: 'Range',
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index e9d1232435..a50930dea8 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -190,7 +190,7 @@ export class Ssh implements INodeType {
 					},
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+				description: 'Name of the binary property which contains the data for the file to be uploaded.',
 			},
 			{
 				displayName: 'Target Directory',
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 3db8ec3e7d..cf7f5c7667 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -161,7 +161,7 @@ export class Stackby implements INodeType {
 						type: 'string',
 						default: '',
 						placeholder: 'All Stories',
-						description: 'The name or ID of a view in the Stories table. If set,<br />only the records in that view will be returned. The records<br />will be sorted according to the order of the view.',
+						description: 'The name or ID of a view in the Stories table. If set, only the records in that view will be returned. The records will be sorted according to the order of the view.',
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 9500891224..7b27e5390c 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -103,7 +103,7 @@ export class StravaTrigger implements INodeType {
 				name: 'resolveData',
 				type: 'boolean',
 				default: true,
-				description: 'By default the webhook-data only contain the Object ID. If this option gets activated it<br />will resolve the data automatically.',
+				description: 'By default the webhook-data only contain the Object ID. If this option gets activated, it will resolve the data automatically.',
 			},
 			{
 				displayName: 'Options',
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 88bc851632..c775b1982a 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -325,7 +325,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 					},
 				},
 				default: true,
-				description: 'By default the webhook-data only contain the IDs. If this option gets activated it<br />will resolve the data automatically.',
+				description: 'By default the webhook-data only contain the IDs. If this option gets activated, it will resolve the data automatically.',
 			},
 			{
 				displayName: 'Only Answers',
diff --git a/packages/nodes-base/nodes/Tapfiliate/AffiliateDescription.ts b/packages/nodes-base/nodes/Tapfiliate/AffiliateDescription.ts
index 0970e34ccc..42a9245281 100644
--- a/packages/nodes-base/nodes/Tapfiliate/AffiliateDescription.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/AffiliateDescription.ts
@@ -176,7 +176,7 @@ export const affiliateFields = [
 				name: 'companyName',
 				type: 'string',
 				default: '',
-				description: `The affiliate’s company data,`,
+				description: `The affiliate’s company data.`,
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 3e1f9ad2fd..87bb7a973f 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -320,7 +320,7 @@ export class Telegram implements INodeType {
 					},
 				},
 				required: true,
-				description: 'Unique identifier for the target chat or username of the target<br />channel (in the format @channelusername).',
+				description: 'Unique identifier for the target chat or username of the target channel (in the format @channelusername).',
 			},
 
 			// ----------------------------------
@@ -740,7 +740,7 @@ export class Telegram implements INodeType {
 					},
 				},
 				required: true,
-				description: 'Unique identifier for the target chat or username of the target<br />channel (in the format @channelusername). To find your chat id ask @get_id_bot.',
+				description: 'Unique identifier for the target chat or username of the target channel (in the format @channelusername). To find your chat id ask @get_id_bot.',
 			},
 			// ----------------------------------
 			//         message:sendAnimation/sendAudio/sendDocument/sendPhoto/sendSticker/sendVideo
@@ -890,7 +890,7 @@ export class Telegram implements INodeType {
 						],
 					},
 				},
-				description: 'Animation to send. Pass a file_id to send an animation that exists on the Telegram servers (recommended)<br />, an HTTP URL for Telegram to get an animation from the Internet',
+				description: 'Animation to send. Pass a file_id to send an animation that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get an animation from the Internet',
 			},
 
 
@@ -916,7 +916,7 @@ export class Telegram implements INodeType {
 						],
 					},
 				},
-				description: 'Audio file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended)<br />, an HTTP URL for Telegram to get a file from the Internet',
+				description: 'Audio file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet',
 			},
 
 
@@ -1007,7 +1007,7 @@ export class Telegram implements INodeType {
 						],
 					},
 				},
-				description: 'Document to send. Pass a file_id to send a file that exists on the Telegram servers (recommended)<br />, an HTTP URL for Telegram to get a file from the Internet',
+				description: 'Document to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet',
 			},
 
 
@@ -1110,7 +1110,7 @@ export class Telegram implements INodeType {
 								name: 'media',
 								type: 'string',
 								default: '',
-								description: 'Media to send. Pass a file_id to send a file that exists on the Telegram servers (recommended)<br />or pass an HTTP URL for Telegram to get a file from the Internet.',
+								description: 'Media to send. Pass a file_id to send a file that exists on the Telegram servers (recommended) or pass an HTTP URL for Telegram to get a file from the Internet.',
 							},
 							{
 								displayName: 'Additional Fields',
@@ -1202,7 +1202,7 @@ export class Telegram implements INodeType {
 						],
 					},
 				},
-				description: 'Photo to send. Pass a file_id to send a photo that exists on the Telegram servers (recommended)<br />, an HTTP URL for Telegram to get a photo from the Internet',
+				description: 'Photo to send. Pass a file_id to send a photo that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a photo from the Internet',
 			},
 
 
@@ -1227,7 +1227,7 @@ export class Telegram implements INodeType {
 						],
 					},
 				},
-				description: 'Sticker to send. Pass a file_id to send a file that exists on the Telegram servers (recommended)<br />, an HTTP URL for Telegram to get a .webp file from the Internet',
+				description: 'Sticker to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a .webp file from the Internet',
 			},
 
 
@@ -1252,7 +1252,7 @@ export class Telegram implements INodeType {
 						],
 					},
 				},
-				description: 'Video file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended)<br />, an HTTP URL for Telegram to get a file from the Internet',
+				description: 'Video file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet',
 			},
 
 			// ----------------------------------
@@ -1414,14 +1414,14 @@ export class Telegram implements INodeType {
 														name: 'switch_inline_query_current_chat',
 														type: 'string',
 														default: '',
-														description: 'If set, pressing the button will insert the bot‘s username and the specified<br />inline query in the current chat\'s input field.Can be empty, in which case only the<br />bot’s username will be inserted.',
+														description: 'If set, pressing the button will insert the bot‘s username and the specified inline query in the current chat\'s input field.Can be empty, in which case only the bot’s username will be inserted.',
 													},
 													{
 														displayName: 'Switch Inline Query',
 														name: 'switch_inline_query',
 														type: 'string',
 														default: '',
-														description: 'If set, pressing the button will prompt the user to select one of their chats<br />, open that chat and insert the bot‘s username and the specified inline query in the<br />input field. Can be empty, in which case just the bot’s username will be inserted.',
+														description: 'If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot‘s username and the specified inline query in the input field. Can be empty, in which case just the bot’s username will be inserted.',
 													},
 													{
 														displayName: 'URL',
@@ -1788,7 +1788,7 @@ export class Telegram implements INodeType {
 							},
 						},
 						default: '',
-						description: 'Thumbnail of the file sent; can be ignored if thumbnail generation<br />for the file is supported server-side. The thumbnail should be in<br />JPEG format and less than 200 kB in size. A thumbnail‘s<br />width and height should not exceed 320.',
+						description: 'Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail‘s width and height should not exceed 320.',
 					},
 					{
 						displayName: 'Width',
diff --git a/packages/nodes-base/nodes/Trello/BoardDescription.ts b/packages/nodes-base/nodes/Trello/BoardDescription.ts
index c613d0ce22..7498a21333 100644
--- a/packages/nodes-base/nodes/Trello/BoardDescription.ts
+++ b/packages/nodes-base/nodes/Trello/BoardDescription.ts
@@ -368,7 +368,7 @@ export const boardFields = [
 				name: 'fields',
 				type: 'string',
 				default: 'all',
-				description: 'Fields to return. Either "all" or a comma-separated list:<br />closed, dateLastActivity, dateLastView, desc, descData,<br />idOrganization, invitations, invited, labelNames, memberships,<br />name, pinned, powerUps, prefs, shortLink, shortUrl,<br />starred, subscribed, url',
+				description: 'Fields to return. Either "all" or a comma-separated list: closed, dateLastActivity, dateLastView, desc, descData, idOrganization, invitations, invited, labelNames, memberships, name, pinned, powerUps, prefs, shortLink, shortUrl, starred, subscribed, url',
 			},
 			{
 				displayName: 'Plugin Data',
diff --git a/packages/nodes-base/nodes/Trello/CardDescription.ts b/packages/nodes-base/nodes/Trello/CardDescription.ts
index 9a9661023e..7d400dd577 100644
--- a/packages/nodes-base/nodes/Trello/CardDescription.ts
+++ b/packages/nodes-base/nodes/Trello/CardDescription.ts
@@ -243,7 +243,7 @@ export const cardFields = [
 				name: 'fields',
 				type: 'string',
 				default: 'all',
-				description: 'Fields to return. Either "all" or a comma-separated list:<br />badges, checkItemStates, closed, dateLastActivity, desc,<br />descData, due, email, idBoard, idChecklists, idLabels, idList,<br />idMembers, idShort, idAttachmentCover, manualCoverAttachment<br />, labels, name, pos, shortUrl, url',
+				description: 'Fields to return. Either "all" or a comma-separated list:<br />badges, checkItemStates, closed, dateLastActivity, desc, descData, due, email, idBoard, idChecklists, idLabels, idList, idMembers, idShort, idAttachmentCover, manualCoverAttachment, labels, name, pos, shortUrl, url',
 			},
 			{
 				displayName: 'Board',
@@ -257,7 +257,7 @@ export const cardFields = [
 				name: 'board_fields',
 				type: 'string',
 				default: 'all',
-				description: 'Fields to return. Either "all" or a comma-separated list:<br />name, desc, descData, closed, idOrganization, pinned, url, prefs',
+				description: 'Fields to return. Either "all" or a comma-separated list: name, desc, descData, closed, idOrganization, pinned, url, prefs',
 			},
 			{
 				displayName: 'Custom Field Items',
@@ -278,7 +278,7 @@ export const cardFields = [
 				name: 'member_fields',
 				type: 'string',
 				default: 'all',
-				description: 'Fields to return. Either "all" or a comma-separated list:<br />avatarHash, fullName, initials, username',
+				description: 'Fields to return. Either "all" or a comma-separated list: avatarHash, fullName, initials, username',
 			},
 			{
 				displayName: 'Plugin Data',
diff --git a/packages/nodes-base/nodes/Twitter/DirectMessageDescription.ts b/packages/nodes-base/nodes/Twitter/DirectMessageDescription.ts
index ba652990f5..0fb8e15cb1 100644
--- a/packages/nodes-base/nodes/Twitter/DirectMessageDescription.ts
+++ b/packages/nodes-base/nodes/Twitter/DirectMessageDescription.ts
@@ -91,7 +91,7 @@ export const directMessageFields = [
 				name: 'attachment',
 				type: 'string',
 				default: 'data',
-				description: 'Name of the binary property which contain<br />data that should be added to the direct message as attachment.',
+				description: 'Name of the binary property which contain data that should be added to the direct message as attachment.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Twitter/TweetDescription.ts b/packages/nodes-base/nodes/Twitter/TweetDescription.ts
index 254f600b48..f039f0f844 100644
--- a/packages/nodes-base/nodes/Twitter/TweetDescription.ts
+++ b/packages/nodes-base/nodes/Twitter/TweetDescription.ts
@@ -93,7 +93,7 @@ export const tweetFields = [
 				name: 'attachments',
 				type: 'string',
 				default: 'data',
-				description: 'Name of the binary properties which contain<br />data which should be added to tweet as attachment.<br />Multiple ones can be comma separated.',
+				description: 'Name of the binary properties which contain data which should be added to tweet as attachment.<br />Multiple ones can be comma separated.',
 			},
 			{
 				displayName: 'Display Coordinates',
diff --git a/packages/nodes-base/nodes/Wait.node.ts b/packages/nodes-base/nodes/Wait.node.ts
index 9c595c7b4b..2a5f064a62 100644
--- a/packages/nodes-base/nodes/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait.node.ts
@@ -340,7 +340,7 @@ export class Wait implements INodeType {
 					},
 				],
 				default: 'firstEntryJson',
-				description: 'What data should be returned. If it should return<br />all the items as array or only the first item as object',
+				description: 'What data should be returned. If it should return all the items as array or only the first item as object',
 			},
 			{
 				displayName: 'Property Name',
@@ -365,7 +365,7 @@ export class Wait implements INodeType {
 				name: 'limitWaitTime',
 				type: 'boolean',
 				default: false,
-				description: `If no webhook call is received, the workflow will automatically<br />
+				description: `If no webhook call is received, the workflow will automatically
 							 resume execution after the specified limit type`,
 				displayOptions: {
 					show: {
@@ -528,8 +528,8 @@ export class Wait implements INodeType {
 								],
 							},
 						},
-						description: `Name of the binary property to which to write the data of<br />
-									the received file. If the data gets received via "Form-Data Multipart"<br />
+						description: `Name of the binary property to which to write the data of
+									the received file. If the data gets received via "Form-Data Multipart"
 									it will be the prefix and a number starting with 0 will be attached to it.`,
 					},
 					{
diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index dbe2f7041f..e04fe2813f 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -202,7 +202,7 @@ export class Webhook implements INodeType {
 					},
 				],
 				default: 'firstEntryJson',
-				description: 'What data should be returned. If it should return<br />all items as an array or only the first item as object.',
+				description: 'What data should be returned. If it should return all items as an array or only the first item as object.',
 			},
 			{
 				displayName: 'Property Name',
@@ -253,8 +253,8 @@ export class Webhook implements INodeType {
 								],
 							},
 						},
-						description: `Name of the binary property to write the data of<br />
-									the received file to. If the data gets received via "Form-Data Multipart"<br />
+						description: `Name of the binary property to write the data of
+									the received file to. If the data gets received via "Form-Data Multipart"
 									it will be the prefix and a number starting with 0 will be attached to it.`,
 					},
 					{
diff --git a/packages/nodes-base/nodes/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
index a9e52696c6..923f01c119 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
@@ -44,7 +44,7 @@ export class WriteBinaryFile implements INodeType {
 				type: 'string',
 				default: 'data',
 				required: true,
-				description: 'Name of the binary property which contains<br />the data for the file to be written.',
+				description: 'Name of the binary property which contains the data for the file to be written.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/Xml.node.ts b/packages/nodes-base/nodes/Xml.node.ts
index 2b42926c81..f285fe0156 100644
--- a/packages/nodes-base/nodes/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml.node.ts
@@ -61,7 +61,7 @@ export class Xml implements INodeType {
 				},
 				default: 'data',
 				required: true,
-				description: 'Name of the property to which to contains<br />the converted XML data.',
+				description: 'Name of the property to which to contains the converted XML data.',
 			},
 			{
 				displayName: 'Options',
@@ -140,7 +140,7 @@ export class Xml implements INodeType {
 				},
 				default: 'data',
 				required: true,
-				description: 'Name of the property which contains<br />the XML data to convert.',
+				description: 'Name of the property which contains the XML data to convert.',
 			},
 			{
 				displayName: 'Options',
diff --git a/packages/nodes-base/nodes/Zulip/MessageDescription.ts b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
index 883928a7ca..454b51ac1d 100644
--- a/packages/nodes-base/nodes/Zulip/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
@@ -302,6 +302,6 @@ export const messageFields = [
 				],
 			},
 		},
-		description: 'Name of the binary property to which to<br />write the data of the read file.',
+		description: 'Name of the binary property to which to write the data of the read file.',
 	},
 ] as INodeProperties[];

From ba8c922604424403e2528a6894126ff35662788d Mon Sep 17 00:00:00 2001
From: Oliver Trajceski <olivertrajceski@yahoo.com>
Date: Thu, 28 Oct 2021 01:14:29 +0200
Subject: [PATCH 3/3] :bug: Fixed Expression Renaming Bug (#2368)

* N8N-2551 - Fixed Expression Renaming Bug

* N8N-2551 - Format prettier
---
 packages/workflow/src/Workflow.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index d0b2e1efa4..7152cbac7b 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -416,7 +416,7 @@ export class Workflow {
 
 					parameterValue = parameterValue.replace(
 						// eslint-disable-next-line no-useless-escape
-						new RegExp(`(\\$node(\.|\\["|\\[\'))${currentNameEscaped}((\.|"\\]|\'\\]))`, 'g'),
+						new RegExp(`(\\$node(\.|\\["|\\[\'))${currentNameEscaped}((\s/g|"\\]|\'\\]))`, 'g'),
 						`$1${newName}$3`,
 					);
 				}