diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
index 35095a16e3..39c94d1ffb 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
@@ -233,7 +233,9 @@
           <div class="notification-content mini" [style.background-color]="preview.processedTemplates.MICROSOFT_TEAMS?.themeColor">
             <div class="subject">{{ preview.processedTemplates.MICROSOFT_TEAMS.subject }}</div>
             {{ preview.processedTemplates.MICROSOFT_TEAMS.body }}
-            <button mat-raised-button>{{ preview.processedTemplates.MICROSOFT_TEAMS.button?.text }}</button>
+            @if (preview.processedTemplates.MICROSOFT_TEAMS.button?.enabled) {
+              <button mat-raised-button>{{ preview.processedTemplates.MICROSOFT_TEAMS.button?.text }}</button>
+            }
           </div>
         </section>
       </div>
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html
index 3eb330bb50..cba2c54a7b 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html
@@ -44,8 +44,8 @@
           </mat-error>
         </mat-form-field>
       </div>
-      <div class="flex flex-row xs:flex-col gt-xs:gap-2">
-        <mat-form-field class="max-w-30% flex-full xs:max-w-full">
+      <div class="grid gt-sm:grid-cols-3 gt-sm:gap-4">
+        <mat-form-field class="mat-block">
           <mat-label translate>notification.action-type</mat-label>
           <mat-select formControlName="linkType">
             <mat-option *ngFor="let actionButtonLinkType of actionButtonLinkTypes"
@@ -54,32 +54,28 @@
             </mat-option>
           </mat-select>
         </mat-form-field>
-        <mat-form-field class="flex-1"
-                        *ngIf="actionButtonConfigForm.get('linkType').value === actionButtonLinkType.LINK; else dashboardSelector">
-          <mat-label translate>notification.link</mat-label>
-          <input matInput formControlName="link" required>
-          <mat-error
-            *ngIf="actionButtonConfigForm.get('link').hasError('required')">
-            {{ 'notification.link-required' | translate }}
-          </mat-error>
-          <mat-error
-            *ngIf="actionButtonConfigForm.get('link').hasError('maxlength')">
-            {{ 'notification.link-max-length' | translate :
-                {length: actionButtonConfigForm.get('link').getError('maxlength').requiredLength}
-            }}
-          </mat-error>
-        </mat-form-field>
-        <ng-template #dashboardSelector>
-          <tb-dashboard-autocomplete
-            class="max-w-35% flex-full xs:max-w-full"
-            required
-            formControlName="dashboardId">
+        @if(actionButtonConfigForm.get('linkType').value === actionButtonLinkType.LINK) {
+          <mat-form-field class="gt-sm:col-span-2">
+            <mat-label translate>notification.link</mat-label>
+            <input matInput formControlName="link" required>
+            <mat-error
+              *ngIf="actionButtonConfigForm.get('link').hasError('required')">
+              {{ 'notification.link-required' | translate }}
+            </mat-error>
+            <mat-error
+              *ngIf="actionButtonConfigForm.get('link').hasError('maxlength')">
+              {{ 'notification.link-max-length' | translate :
+              {length: actionButtonConfigForm.get('link').getError('maxlength').requiredLength}
+              }}
+            </mat-error>
+          </mat-form-field>
+        } @else {
+          <tb-dashboard-autocomplete required formControlName="dashboardId">
           </tb-dashboard-autocomplete>
-          <tb-dashboard-state-autocomplete class="max-w-35% flex-full xs:max-w-full"
-                                           [dashboardId]="actionButtonConfigForm.get('dashboardId').value"
+          <tb-dashboard-state-autocomplete [dashboardId]="actionButtonConfigForm.get('dashboardId').value"
                                            formControlName="dashboardState">
           </tb-dashboard-state-autocomplete>
-        </ng-template>
+        }
       </div>
       <mat-slide-toggle formControlName="setEntityIdInState" class="toggle"
                         *ngIf="actionButtonConfigForm.get('linkType').value === actionButtonLinkType.DASHBOARD">