diff --git a/ui-ngx/src/app/shared/components/help-popup.component.html b/ui-ngx/src/app/shared/components/help-popup.component.html
index c24b5234b9..fcdd345bc3 100644
--- a/ui-ngx/src/app/shared/components/help-popup.component.html
+++ b/ui-ngx/src/app/shared/components/help-popup.component.html
@@ -17,9 +17,9 @@
 -->
 <fieldset class="tb-help-popup-button-container" *ngIf="!textMode">
   <div #toggleHelpButton
+       class="tb-toggle-help-popup-button"
        matTooltip="{{ helpIconTooltip }}"
        matTooltipPosition="above"
-       style="border-radius: 50%"
        (click)="toggleHelp()">
     <button mat-icon-button
             [disabled]="disabled()"
@@ -36,6 +36,7 @@
 </fieldset>
 <fieldset class="tb-help-popup-button-container" [class.hint-button]="hintMode" *ngIf="textMode">
   <div #toggleHelpTextButton
+       class="tb-toggle-help-popup-text-button"
        (click)="toggleHelp()">
     <button mat-button
             [disabled]="disabled()"
diff --git a/ui-ngx/src/app/shared/components/help-popup.component.scss b/ui-ngx/src/app/shared/components/help-popup.component.scss
index fb31a3a6bd..a5471497a1 100644
--- a/ui-ngx/src/app/shared/components/help-popup.component.scss
+++ b/ui-ngx/src/app/shared/components/help-popup.component.scss
@@ -28,6 +28,11 @@
   z-index: 1;
 }
 
+.tb-toggle-help-popup-button {
+  border-radius: 50%;
+  line-height: normal;
+}
+
 .tb-help-popup-button {
   position: relative;
   .mat-mdc-progress-spinner {
diff --git a/ui-ngx/src/app/shared/components/help-popup.component.ts b/ui-ngx/src/app/shared/components/help-popup.component.ts
index b169111ef7..8caf25f613 100644
--- a/ui-ngx/src/app/shared/components/help-popup.component.ts
+++ b/ui-ngx/src/app/shared/components/help-popup.component.ts
@@ -17,9 +17,10 @@
 import {
   Component,
   ElementRef,
-  Input, OnChanges,
-  OnDestroy,
-  Renderer2, SimpleChanges,
+  Input,
+  OnChanges,
+  Renderer2,
+  SimpleChanges,
   ViewChild,
   ViewContainerRef,
   ViewEncapsulation
@@ -38,7 +39,7 @@ import { TranslateService } from '@ngx-translate/core';
   styleUrls: ['./help-popup.component.scss'],
   encapsulation: ViewEncapsulation.None
 })
-export class HelpPopupComponent implements OnChanges, OnDestroy {
+export class HelpPopupComponent implements OnChanges {
 
   @ViewChild('toggleHelpButton', {read: ElementRef, static: false}) toggleHelpButton: ElementRef;
   @ViewChild('toggleHelpTextButton', {read: ElementRef, static: false}) toggleHelpTextButton: ElementRef;
@@ -93,7 +94,7 @@ export class HelpPopupComponent implements OnChanges, OnDestroy {
               private translate: TranslateService) {
   }
 
-  ngOnChanges(changes: SimpleChanges): void {
+  ngOnChanges(_changes: SimpleChanges): void {
     if (isDefinedAndNotNull(this.triggerText)) {
       this.triggerSafeHtml = this.sanitizer.bypassSecurityTrustHtml(this.triggerText);
     } else {
@@ -124,8 +125,4 @@ export class HelpPopupComponent implements OnChanges, OnDestroy {
         this.helpPopupStyle);
     }
   }
-
-  ngOnDestroy(): void {
-  }
-
 }