-<span class="material-icons" placement="{{placement}}" *ngIf="helpLink.length < 1; else withUrl" ngbPopover="{{helpText}}" triggers="keyup.enter click" tabindex="0">live_help</span>
-<ng-template #withUrl>
- <ng-template #popContent>
- <a target="_blank" href="{{helpLink}}">{{helpText}}</a>
- </ng-template>
- <span class="material-icons" [ngbPopover]="popContent" placement="{{placement}}" triggers="keyup.enter click" tabindex="0">live_help</span>
+<ng-template #popContent>
+ <a target="_blank" href="{{helpLink}}" *ngIf="helpLink.length >= 1">{{helpText}}</a>
+ <span *ngIf="helpLink.length < 1">{{helpText}}</span>
</ng-template>
+<button class="btn btn-sm" placement="{{placement}}" [ngbPopover]="popContent" triggers="click"i
+ i18n-aria-label aria-label="Show help" aria-haspopup="true">
+ <span class="material-icons" i18n-aria-label aria-label="Show help">live_help</span>
+</button>