diff --git a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.component.scss b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.component.ts b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.component.ts
index 269ff208ae..20af5a5fd6 100644
--- a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.component.ts
+++ b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policies.component.ts
@@ -22,7 +22,7 @@ import { take } from 'rxjs/operators';
 @Component({
   selector: 'app-policies',
   templateUrl: './policies.component.html',
-  styleUrls: [ './policies.component.scss' ],
+  styleUrls: [],
 })
 export class PoliciesComponent {
   policiesView$: Observable<View<Policy[]>>;
diff --git a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts
index 03179a52a7..57f2db42a0 100644
--- a/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts
+++ b/frontend/src/app/modules/page/admin/presentation/policy-management/policies/policy.assembler.ts
@@ -79,6 +79,7 @@ export class PoliciesAssembler {
     return constrainsList;
   }
 
+  /*
   public static validatePoliciesTemplate(data: any) {
 
     if (typeof data !== 'object' || data === null || !Array.isArray(data[Object.keys(data)[0]])) {
@@ -155,4 +156,6 @@ export class PoliciesAssembler {
     return true;
   }
 
+   */
+
 }
diff --git a/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.html b/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.html
index 5f5c891918..2699a3bc21 100644
--- a/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.html
+++ b/frontend/src/app/modules/page/admin/presentation/policy-management/policy-editor/policy-editor.component.html
@@ -92,6 +92,7 @@
       >
         <app-button [variant]="'raised'" [color]="'primary'"
                     (click)="applyTemplate()"
+                    onkeydown="applyTemplate()"
                     [isDisabled]="!templateFile"
                     class="mr-2"
         >{{ 'pageAdmin.policyManagement.apply' | i18n }}
@@ -148,6 +149,7 @@ <h4 class="pb-2">{{ 'pageAdmin.policyManagement.constraints' | i18n }} {{ '(' +
              class="mb-2" *ngIf="viewMode !== ViewMode.VIEW">
           <app-button
             [iconName]="'add'"
+            onkeydown="addConstraintFormGroup()"
             (click)="addConstraintFormGroup()"
           ></app-button>
         </div>
@@ -199,6 +201,7 @@ <h4 class="pb-2">{{ 'pageAdmin.policyManagement.constraints' | i18n }} {{ '(' +
               >
                 <app-button
                   [iconName]="'arrow_downward'"
+                  onkeydown="moveConstraintDown(i)"
                   (click)="moveConstraintDown(i)"
                 >
                 </app-button>
@@ -213,6 +216,7 @@ <h4 class="pb-2">{{ 'pageAdmin.policyManagement.constraints' | i18n }} {{ '(' +
 
                 <app-button
                   [iconName]="'arrow_upward'"
+                  onkeydown="moveConstraintUp(i)"
                   (click)="moveConstraintUp(i)"
                 >
                 </app-button>
@@ -226,6 +230,7 @@ <h4 class="pb-2">{{ 'pageAdmin.policyManagement.constraints' | i18n }} {{ '(' +
               >
                 <app-button
                   [iconName]="'delete'"
+                  onkeydown="removeConstraintFormGroup(i)"
                   (click)="removeConstraintFormGroup(i)"
                 >
                 </app-button>
diff --git a/frontend/src/app/modules/page/policies/model/policy.model.ts b/frontend/src/app/modules/page/policies/model/policy.model.ts
index d8f32b3063..fc79e80227 100644
--- a/frontend/src/app/modules/page/policies/model/policy.model.ts
+++ b/frontend/src/app/modules/page/policies/model/policy.model.ts
@@ -121,22 +121,16 @@ export function getOperatorTypeSign(type: OperatorType): string {
   switch (type) {
     case OperatorType.EQ:
       return '=';
-      break;
     case OperatorType.NEQ:
       return '!=';
-      break;
     case OperatorType.LT:
       return '<';
-      break;
     case OperatorType.GT:
       return '>';
-      break;
     case OperatorType.LTEQ:
       return '<=';
-      break;
     case OperatorType.GTEQ:
       return '>=';
-      break;
     default:
       return type.toString();
   }
diff --git a/frontend/src/app/modules/shared/components/table/table.component.html b/frontend/src/app/modules/shared/components/table/table.component.html
index e590411b0a..fa62579a30 100644
--- a/frontend/src/app/modules/shared/components/table/table.component.html
+++ b/frontend/src/app/modules/shared/components/table/table.component.html
@@ -90,6 +90,7 @@
         <app-button
           [iconName]="'delete'"
           (click)="handleItemDeletion()"
+          onkeydown="handleItemDeletion()"
           [isDisabled]="selection.selected.length < 1"
         >
         </app-button>