diff --git a/.github/workflows/dotnet-core-master.yml b/.github/workflows/dotnet-core-master.yml
index a76ff6677..f5f510e5e 100644
--- a/.github/workflows/dotnet-core-master.yml
+++ b/.github/workflows/dotnet-core-master.yml
@@ -28,6 +28,11 @@ jobs:
       run: |
         cp -av eform-angular-timeplanning-plugin/eform-client/src/app/plugins/modules/time-planning-pn eform-angular-frontend/eform-client/src/app/plugins/modules/time-planning-pn
         cd eform-angular-frontend/eform-client && ../../eform-angular-timeplanning-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/time-planning-pn
     - name: Copy Dockerfile
       run: cp eform-angular-timeplanning-plugin/Dockerfile .
     - name: Build the tagged Docker image
diff --git a/.github/workflows/dotnet-core-pr.yml b/.github/workflows/dotnet-core-pr.yml
index 4efef1d73..4ee1d5c95 100644
--- a/.github/workflows/dotnet-core-pr.yml
+++ b/.github/workflows/dotnet-core-pr.yml
@@ -24,6 +24,11 @@ jobs:
       run: |
         cp -av eform-angular-timeplanning-plugin/eform-client/src/app/plugins/modules/time-planning-pn eform-angular-frontend/eform-client/src/app/plugins/modules/time-planning-pn
         cd eform-angular-frontend/eform-client && ../../eform-angular-timeplanning-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/time-planning-pn
     - name: Copy Dockerfile
       run: cp eform-angular-timeplanning-plugin/Dockerfile .
     - name: Build the tagged Docker image
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-approve-modal/absence-requests-approve-modal.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-approve-modal/absence-requests-approve-modal.component.html
index 4375390a1..b99be5a24 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-approve-modal/absence-requests-approve-modal.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-approve-modal/absence-requests-approve-modal.component.html
@@ -42,15 +42,14 @@ <h3 mat-dialog-title>{{ 'Approve Absence Request' | translate }}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="primary"
+    class="btn-primary"
     id="saveApproveBtn"
     (click)="approve()"
   >
     {{ 'Approve' | translate }}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     id="cancelApproveBtn"
     (click)="hide()"
   >
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-reject-modal/absence-requests-reject-modal.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-reject-modal/absence-requests-reject-modal.component.html
index 2fae5b42a..e22ee8492 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-reject-modal/absence-requests-reject-modal.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-reject-modal/absence-requests-reject-modal.component.html
@@ -42,15 +42,14 @@ <h3 mat-dialog-title>{{ 'Reject Absence Request' | translate }}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="warn"
+    class="btn-primary"
     id="saveRejectBtn"
     (click)="reject()"
   >
     {{ 'Reject' | translate }}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     id="cancelRejectBtn"
     (click)="hide()"
   >
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-create-modal/break-policies-create-modal.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-create-modal/break-policies-create-modal.component.html
index 68b1cd465..a30fafaea 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-create-modal/break-policies-create-modal.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-create-modal/break-policies-create-modal.component.html
@@ -20,8 +20,7 @@ <h3 mat-dialog-title>{{'Create Break Policy' | translate}}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="primary"
+    class="btn-primary"
     id="saveCreateBtn"
     (click)="createBreakPolicy()"
     [disabled]="breakPolicyForm.invalid"
@@ -29,7 +28,7 @@ <h3 mat-dialog-title>{{'Create Break Policy' | translate}}</h3>
     {{'Create' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     id="cancelCreateBtn"
     (click)="hide()"
   >
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-delete-modal/break-policies-delete-modal.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-delete-modal/break-policies-delete-modal.component.html
index 843acc4a0..4a9cbdaa6 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-delete-modal/break-policies-delete-modal.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-delete-modal/break-policies-delete-modal.component.html
@@ -19,15 +19,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="saveDeleteBtn"
     (click)="deleteSingle()"
   >
     {{'Delete' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     id="cancelDeleteBtn"
     (click)="hide()"
   >
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policy-rule-dialog/break-policy-rule-dialog.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policy-rule-dialog/break-policy-rule-dialog.component.html
index 5356b6a6a..a4f0c83e4 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policy-rule-dialog/break-policy-rule-dialog.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policy-rule-dialog/break-policy-rule-dialog.component.html
@@ -5,13 +5,12 @@ <h2 mat-dialog-title>{{ dialogTitle | translate }}</h2>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
-  <button mat-button
+  <button class="btn-cancel"
           (click)="onCancel()"
           id="cancelBtn">
     {{ 'Cancel' | translate }}
   </button>
-  <button mat-raised-button
-          color="primary"
+  <button class="btn-primary"
           (click)="onSave()"
           [disabled]="!ruleForm.valid"
           id="saveBtn">
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/flexes/components/time-flexes-actions/comment-office-all-update-modal/time-flexes-comment-office-all-update-modal.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/flexes/components/time-flexes-actions/comment-office-all-update-modal/time-flexes-comment-office-all-update-modal.component.html
index ea45dda11..f316e7010 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/flexes/components/time-flexes-actions/comment-office-all-update-modal/time-flexes-comment-office-all-update-modal.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/flexes/components/time-flexes-actions/comment-office-all-update-modal/time-flexes-comment-office-all-update-modal.component.html
@@ -17,15 +17,14 @@ <h3 mat-dialog-title>{{ 'Edit comment office all' | translate }}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="accent"
+    class="btn-primary"
     (click)="onUpdateFlexPlanning()"
     id="flexesCommentOfficeAllEditSaveBtn"
   >
     {{'Save' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     (click)="hide()"
     id="flexesCommentOfficeAllEditSaveCancelBtn"
   >
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-otp-code/registration-devices-otp-code.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-otp-code/registration-devices-otp-code.component.html
index 13a854226..095a116e8 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-otp-code/registration-devices-otp-code.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-otp-code/registration-devices-otp-code.component.html
@@ -9,14 +9,13 @@ <h1 class="text-danger">{{'WARNING' | translate}}!</h1>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="warn"
+    class="btn-primary"
     (click)="requestOtp()"
   >
     {{'OK' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     (click)="hide()"
   >
     {{'Cancel' | translate}}
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-comment-office-all-update-modal/working-hours-comment-office-all-update-modal.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-comment-office-all-update-modal/working-hours-comment-office-all-update-modal.component.html
index 4aaf49ccb..f449171e2 100644
--- a/eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-comment-office-all-update-modal/working-hours-comment-office-all-update-modal.component.html
+++ b/eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-comment-office-all-update-modal/working-hours-comment-office-all-update-modal.component.html
@@ -17,15 +17,14 @@ <h3 mat-dialog-title>{{ 'Edit comment office all' | translate }}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="accent"
+    class="btn-primary"
     (click)="save()"
     id="flexesCommentOfficeAllEditSaveBtn"
   >
     {{'Save' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     (click)="hide()"
     id="flexesCommentOfficeAllEditSaveCancelBtn"
   >