diff --git a/libs/core/src/lib/input-group/input-group.component.html b/libs/core/src/lib/input-group/input-group.component.html
index af87098cc2b..67202e3138b 100644
--- a/libs/core/src/lib/input-group/input-group.component.html
+++ b/libs/core/src/lib/input-group/input-group.component.html
@@ -30,7 +30,7 @@
                 [fdType]="inShellbar ? 'standard' : 'transparent'"
                 [id]="_addOnButtonId"
                 [attr.tabindex]="buttonFocusable ? 0 : -1"
-                [attr.title]="iconTitle || glyphAriaLabel || glyph"
+                [attr.title]="iconTitle || glyphAriaLabel"
                 [glyph]="glyph"
                 [class.fd-shellbar__button]="inShellbar"
                 [class.is-expanded]="isExpanded"
@@ -54,7 +54,7 @@
             [id]="_addOnNonButtonId"
             [placement]="placement"
             [attr.aria-label]="glyphAriaLabel || glyph || addOnText"
-            [attr.title]="iconTitle || glyph || addOnText"
+            [attr.title]="iconTitle || addOnText"
         >
             <ng-container *ngIf="!glyph">{{ addOnText }}</ng-container>
 
diff --git a/libs/docs/core/multi-input/e2e/multi-input.po.ts b/libs/docs/core/multi-input/e2e/multi-input.po.ts
index 547f34052f1..4f871dcca41 100644
--- a/libs/docs/core/multi-input/e2e/multi-input.po.ts
+++ b/libs/docs/core/multi-input/e2e/multi-input.po.ts
@@ -3,7 +3,7 @@ import { CoreBaseComponentPo, waitForElDisplayed, waitForPresent } from '../../.
 export class MultiInputPo extends CoreBaseComponentPo {
     private url = '/multi-input';
 
-    activeDropdownButtons = 'button[title="value-help"]:not(:disabled)';
+    activeDropdownButtons = 'button:not(:disabled) .sap-icon--value-help';
     activeInputs = '.fd-multi-input-field input:not(:disabled)';
     disableInputs = 'div.is-disabled';
     simpleMultiInputOptions = '.fd-popover-custom-list [fd-list-item] fd-checkbox';