diff --git a/.github/workflows/dotnet-core-master.yml b/.github/workflows/dotnet-core-master.yml
index c43c4662..825c6c7f 100644
--- a/.github/workflows/dotnet-core-master.yml
+++ b/.github/workflows/dotnet-core-master.yml
@@ -38,6 +38,11 @@ jobs:
         cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts  eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
         mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
         cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-plugin/testinginstallpn.sh
+    - name: Button conventions
+      # The checker lives in the frontend repo (checked out above); these
+      # templates are ours. A frontend CI run cannot see them because
+      # src/app/plugins/ is gitignored there, so this plugin has to run it.
+      run: cd eform-angular-frontend/eform-client && node scripts/check-button-conventions.js src/app/plugins/modules/workflow-pn
     - name: Get the version release
       id: get_release_version
       run: echo "VERSION=$(cd eform-angular-workflow-plugin && git describe --abbrev=0 --tags | cut -d "v" -f 2)" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/dotnet-core-pr.yml b/.github/workflows/dotnet-core-pr.yml
index 4c26a780..5ffc4860 100644
--- a/.github/workflows/dotnet-core-pr.yml
+++ b/.github/workflows/dotnet-core-pr.yml
@@ -35,6 +35,11 @@ jobs:
         cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts  eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
         mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
         cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-plugin/testinginstallpn.sh
+    - name: Button conventions
+      # The checker lives in the frontend repo (checked out above); these
+      # templates are ours. A frontend CI run cannot see them because
+      # src/app/plugins/ is gitignored there, so this plugin has to run it.
+      run: cd eform-angular-frontend/eform-client && node scripts/check-button-conventions.js src/app/plugins/modules/workflow-pn
     - name: Get the version release
       id: get_release_version
       run: echo "VERSION=$(cd eform-angular-workflow-plugin && git describe --abbrev=0 --tags | cut -d "v" -f 2)" >> $GITHUB_OUTPUT
diff --git a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html
index 22157636..915ad616 100644
--- a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html
+++ b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html
@@ -1,32 +1,31 @@
-<h3 mat-dialog-title>{{'Assign site' | translate}}</h3>
-<div mat-dialog-content>
-  <mat-form-field>
-    <mat-label>{{'Select employee' | translate}}</mat-label>
-    <mtx-select
-      appendTo="body"
-      [items]="availableSites"
-      bindLabel="siteName"
-      bindValue="siteUId"
-      [(ngModel)]="selectedSiteId"
-      id="selectDeviceUser"
-    ></mtx-select>
-  </mat-form-field>
-</div>
-<div mat-dialog-actions class="d-flex flex-row justify-content-end">
-  <button
-    mat-raised-button
-    color="accent"
-    id="siteAssignBtnSave"
-    (click)="assignSite()"
-    [disabled]="!selectedSiteId"
-  >
-    {{'Assign' | translate}}
-  </button>
-  <button
-    mat-raised-button
-    id="siteAssignBtnSaveCancel"
-    (click)="hide()"
-  >
-    {{'Cancel' | translate}}
-  </button>
-</div>
+<h3 mat-dialog-title>{{'Assign site' | translate}}</h3>
+<div mat-dialog-content>
+  <mat-form-field>
+    <mat-label>{{'Select employee' | translate}}</mat-label>
+    <mtx-select
+      appendTo="body"
+      [items]="availableSites"
+      bindLabel="siteName"
+      bindValue="siteUId"
+      [(ngModel)]="selectedSiteId"
+      id="selectDeviceUser"
+    ></mtx-select>
+  </mat-form-field>
+</div>
+<div mat-dialog-actions class="d-flex flex-row justify-content-end">
+  <button
+    class="btn-primary"
+    id="siteAssignBtnSave"
+    (click)="assignSite()"
+    [disabled]="!selectedSiteId"
+  >
+    {{'Assign' | translate}}
+  </button>
+  <button
+    class="btn-cancel"
+    id="siteAssignBtnSaveCancel"
+    (click)="hide()"
+  >
+    {{'Cancel' | translate}}
+  </button>
+</div>
diff --git a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html
index 5037985f..2d958cd4 100644
--- a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html
+++ b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html
@@ -1,37 +1,37 @@
-<div mdbModal class="modal fade" #frame="mdbModal">
-  <div class="modal-dialog modal-md">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h3>{{ 'Are you sure you want to remove this site' | translate }}?</h3>
-      </div>
-      <div class="modal-body">
-        <div class="container-fluid">
-          <div class="row">
-            <div class="col-md-6">
-              <h6>{{'Company name' | translate}}</h6>
-            </div>
-            <div class="col-md-6" id="selectedSiteName">
-              <strong>{{selectedSite.siteName}}</strong>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-md-6">
-              <h6>{{'Site Uid' | translate}}</h6>
-            </div>
-            <div class="col-md-6" id="selectedSiteUid">
-              <strong>{{selectedSite.siteUId}}</strong>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button mdbBtn class="btn btn-sm btn-success" (click)="removeSite()" id="removeSiteSaveBtn">
-          {{ 'Remove' | translate }}
-        </button>
-        <button mdbBtn class="btn btn-sm btn-accent text-black-50" (click)="frame.hide()" id="removeSiteSaveCancelBtn">
-          {{ 'Cancel' | translate }}
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
+<div mdbModal class="modal fade" #frame="mdbModal">
+  <div class="modal-dialog modal-md">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h3>{{ 'Are you sure you want to remove this site' | translate }}?</h3>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-6">
+              <h6>{{'Company name' | translate}}</h6>
+            </div>
+            <div class="col-md-6" id="selectedSiteName">
+              <strong>{{selectedSite.siteName}}</strong>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-6">
+              <h6>{{'Site Uid' | translate}}</h6>
+            </div>
+            <div class="col-md-6" id="selectedSiteUid">
+              <strong>{{selectedSite.siteUId}}</strong>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button class="btn-delete" (click)="removeSite()" id="removeSiteSaveBtn">
+          {{ 'Remove' | translate }}
+        </button>
+        <button class="btn-cancel" (click)="frame.hide()" id="removeSiteSaveCancelBtn">
+          {{ 'Cancel' | translate }}
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html b/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html
index 71082c7c..2a392f49 100644
--- a/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html
+++ b/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html
@@ -27,15 +27,14 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete' | translate}}?</h3>
   </div>
   <div mat-dialog-actions class="d-flex flex-row justify-content-end">
     <button
-      mat-raised-button
-      color="warn"
+      class="btn-delete"
       id="workflowCaseDeleteDeleteBtn"
       (click)="deleteWorkflowCase()"
     >
       {{'Delete' | translate}}
     </button>
     <button
-      mat-raised-button
+      class="btn-cancel"
       id="workflowCaseDeleteCancelBtn"
       (click)="hide()"
     >