diff --git a/api/js/etemplate/Et2Email/Et2Email.ts b/api/js/etemplate/Et2Email/Et2Email.ts
index d3f7814938..2e18fc8a41 100644
--- a/api/js/etemplate/Et2Email/Et2Email.ts
+++ b/api/js/etemplate/Et2Email/Et2Email.ts
@@ -932,6 +932,7 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
 
 		return html`
             <et2-email-tag
+                    exportparts="image"
                     part="tag"
                     class=${classMap({
                         "et2-select-draggable": !this.readonly && this.allowDragAndDrop,
@@ -985,7 +986,7 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
 		return html`
             <sl-option
                     part="option"
-                    exportparts="prefix:tag__prefix, suffix:tag__suffix"
+                    exportparts="prefix:tag__prefix, suffix:tag__suffix, image"
                     title="${!option.title || this.noLang ? option.title : this.egw().lang(option.title)}"
                     class=${classMap({
                         ...classes
@@ -994,7 +995,7 @@ export class Et2Email extends Et2InputWidget(LitElement) implements SearchMixinI
                     .option=${option}
                     ?disabled=${option.disabled}
             >
-                <et2-lavatar slot="prefix" part="icon" size="1.8em"
+                <et2-lavatar slot="prefix" exportparts="image" part="icon" size="1.8em"
                              lname=${option.lname || nothing}
                              fname=${option.fname || nothing}
                              image=${option.icon || nothing}
diff --git a/api/js/etemplate/Et2Select/Et2Select.ts b/api/js/etemplate/Et2Select/Et2Select.ts
index 1d09f7b013..bb9e1ca96c 100644
--- a/api/js/etemplate/Et2Select/Et2Select.ts
+++ b/api/js/etemplate/Et2Select/Et2Select.ts
@@ -1005,7 +1005,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
 		return html`
             ${this._styleTemplate()}
             <sl-select
-                    exportparts="prefix, tags, display-input, expand-icon, combobox, listbox, option"
+                    exportparts="prefix, tags, display-input, expand-icon, combobox, listbox, option, image"
                     label=${this.label}
                     placeholder=${this.placeholder || (this.multiple && this.emptyLabel ? this.emptyLabel : "")}
                     ?multiple=${this.multiple}
diff --git a/api/js/etemplate/Et2Select/Select/Et2SelectEmail.ts b/api/js/etemplate/Et2Select/Select/Et2SelectEmail.ts
index f753c173ee..ab4964e1af 100644
--- a/api/js/etemplate/Et2Select/Select/Et2SelectEmail.ts
+++ b/api/js/etemplate/Et2Select/Select/Et2SelectEmail.ts
@@ -300,6 +300,7 @@ export class Et2SelectEmail extends Et2Select
 
 		return html`
             <et2-email-tag
+                    exportparts="image"
                     class=${classMap({
                         ...option.classList,
                         "et2-select-draggable": !this.readonly && this.allowFreeEntries && this.allowDragAndDrop,
diff --git a/api/js/etemplate/Et2Select/Tag/Et2EmailTag.ts b/api/js/etemplate/Et2Select/Tag/Et2EmailTag.ts
index c5b4182260..c6376e6405 100644
--- a/api/js/etemplate/Et2Select/Tag/Et2EmailTag.ts
+++ b/api/js/etemplate/Et2Select/Tag/Et2EmailTag.ts
@@ -264,7 +264,7 @@ export class Et2EmailTag extends Et2Tag
 			const option = Et2EmailTag.email_cache[this.value];
 
 			button_or_avatar = html`
-                <et2-lavatar slot="prefix" part="icon" tabindex="-1"
+                <et2-lavatar slot="prefix" exportparts="image" part="icon" tabindex="-1"
                              @mousedown=${this.handleContactMouseDown}
                              .size=${style.getPropertyValue("--icon-width")}
                              lname=${option.lname || nothing}