diff --git a/frontend/src/app/ui/description/editor/description-editor.component.html b/frontend/src/app/ui/description/editor/description-editor.component.html
index 807cf3f4b..de23fe349 100644
--- a/frontend/src/app/ui/description/editor/description-editor.component.html
+++ b/frontend/src/app/ui/description/editor/description-editor.component.html
@@ -131,7 +131,7 @@
 							<div class="col-12">
 								<div class="row mt-3 stepper-actions justify-content-center">
 									<div class="col-auto mb-1">
-										<button mat-button type="button" class="rounded-btn neutral stepper mr-2" [ngClass]="{'previous-disabled': reachedBase}" (click)="previousStep()">
+										<button mat-button type="button" class="rounded-btn neutral stepper mr-2" [disabled]="reachedBase" (click)="previousStep()">
 											<span class="material-icons">chevron_left</span>
 											<div>{{'DESCRIPTION-EDITOR.TOC.PREVIOUS' | translate}}</div>
 										</button>
diff --git a/frontend/src/app/ui/description/editor/description-editor.component.scss b/frontend/src/app/ui/description/editor/description-editor.component.scss
index 54ecc8eee..6c5c5df1c 100644
--- a/frontend/src/app/ui/description/editor/description-editor.component.scss
+++ b/frontend/src/app/ui/description/editor/description-editor.component.scss
@@ -344,19 +344,6 @@
 	font-weight: 700;
 	cursor: pointer;
   }
-
-  .previous-disabled {
-	border: 1px solid #b5b5b5;
-	color: #b5b5b5 !important;
-	cursor: auto !important;
-  }
-
-  .next-disabled {
-	background: #cbcbcb 0% 0% no-repeat padding-box;
-	box-shadow: 0px 3px 6px #1e202029;
-	color: white;
-	cursor: auto !important;
-  }
 }
 
 mat-icon.size-18 {
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
index 241d318e5..9208e4a40 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
@@ -172,13 +172,13 @@
 							<div class="col-12">
 								<div class="row justify-content-center" *ngIf="this.step !== 0">
 									<div class="col-auto mb-1">
-										<button mat-button type="button" class="rounded-btn neutral stepper mr-2" [ngClass]="{'previous-disabled': this.step === 1}" (click)="previousStep()">
+										<button mat-button type="button" class="rounded-btn neutral stepper mr-2" [disabled]="step === 1" (click)="previousStep()">
 											<span class="material-icons">chevron_left</span>
 											<div>{{'PLAN-EDITOR.ACTIONS.PREVIOUS-STEP' | translate}}</div>
                                         </button>
 									</div>
 									<div *ngIf="this.step < this.maxSteps" class="col-auto mb-1">
-										<button mat-button type="button" class="rounded-btn primary stepper" [ngClass]="{ 'next-disabled': this.step === this.maxSteps, 'next': this.step < selectedBlueprint?.definition?.sections?.length, 'description-next': this.step >= selectedBlueprint?.definition?.sections?.length }" (click)="nextStep()">
+										<button mat-button type="button" class="rounded-btn primary stepper" (click)="nextStep()">
 											<div>{{'PLAN-EDITOR.ACTIONS.NEXT-STEP' | translate}}</div>
 											<span class="material-icons" iconPositionEnd>chevron_right</span>
                                         </button>
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
index 3777d89e1..3fde2879a 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
@@ -209,36 +209,6 @@ mat-icon.size-16 {
     align-items: center;
     cursor: pointer;
 }
-  
-.next {
-    background: var(--primary-color) 0% 0% no-repeat padding-box;
-    color: white;
-    box-shadow: 0px 3px 6px #1e202029;
-    font-weight: 400;
-    cursor: pointer;
-}
-  
-.description-next {
-    background: var(--secondary-color) 0% 0% no-repeat padding-box;
-    color: #212121;
-    box-shadow: 0px 3px 6px #1e202029;
-    font-weight: 700;
-    cursor: pointer;
-}
-  
-.previous-disabled,
-.add-description-btn-disabled {
-    border: 1px solid #b5b5b5;
-    color: #b5b5b5 !important;
-    cursor: auto !important;
-}
-  
-.next-disabled {
-    background: #cbcbcb 0% 0% no-repeat padding-box;
-    box-shadow: 0px 3px 6px #1e202029;
-    color: white;
-    cursor: auto !important;
-}
 
 .form {
     position: relative;