diff --git a/dashboard/divId/divIds.component.html b/dashboard/divId/divIds.component.html
index b8b2c69d..fdbfb6ea 100644
--- a/dashboard/divId/divIds.component.html
+++ b/dashboard/divId/divIds.component.html
@@ -48,10 +48,10 @@
         </div>
       </div>
       <table *ngIf="checkboxes.length > 0"class="uk-table uk-table-striped uk-table-large">
-        <thead class="uk-card-header">
+        <thead>
         <tr>
           <th
-              class="uk-width-small"><input id="allDivIdCheckbox" type="checkbox"
+              class="uk-width-small"><input id="allDivIdCheckbox" type="checkbox" class="uk-checkbox"
                                             (change)="toggleCheckBoxes($event)"></th>
           <th>Name</th>
           <th *ngIf="!selectedCommunityPid">Portal Type</th>
@@ -61,7 +61,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let check of checkboxes; let i=index">
-          <td><input id="{{check.divId._id}}" class="checkBox" type="checkbox"
+          <td><input id="{{check.divId._id}}" class="uk-checkbox" type="checkbox"
                      name="divIdscb[]" value="{{check.divId._id}}" [(ngModel)]="check.checked">
           </td>
           <td>
diff --git a/dashboard/divhelpcontent/class-help-content-form.component.html b/dashboard/divhelpcontent/class-help-content-form.component.html
index 93b6babf..d3f7bbea 100644
--- a/dashboard/divhelpcontent/class-help-content-form.component.html
+++ b/dashboard/divhelpcontent/class-help-content-form.component.html
@@ -2,13 +2,9 @@
   <div header>
     <div class="uk-margin-top">
       <a routerLink="../" [queryParams]=" {  'pageId': pageId  }"
-         class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
-         <span class="uk-icon-button uk-icon small uk-button-secondary">
-            <icon name="west"></icon>
-         </span>
-        <span class="space">
-          Go back to class help texts list
-        </span>
+				class="uk-button uk-button-link uk-text-uppercase uk-flex uk-flex-middle">
+				<icon name="west" [flex]="true"></icon>
+        <span class="uk-margin-small-left">Go back to class help texts list</span>
       </a>
     </div>
   </div>
diff --git a/dashboard/divhelpcontent/class-help-contents.component.html b/dashboard/divhelpcontent/class-help-contents.component.html
index 5ec30d04..40cebaaf 100644
--- a/dashboard/divhelpcontent/class-help-contents.component.html
+++ b/dashboard/divhelpcontent/class-help-contents.component.html
@@ -17,7 +17,7 @@
       <div class="uk-grid uk-flex-middle uk-margin-top uk-margin-medium-bottom" uk-grid>
         <div>
           <a routerLink="../pages/" class="uk-button uk-button-link uk-text-uppercase uk-flex uk-flex-middle">
-            <icon name="west"></icon>
+            <icon name="west" [flex]="true"></icon>
             <span class="uk-margin-small-left">Back to pages</span>
           </a>
         </div>
@@ -66,7 +66,7 @@
             <div class="uk-grid uk-grid-divider uk-padding" uk-grid>
               <div class="uk-width-4-5 uk-first-column ">
                 <div class="uk-grid uk-flex uk-flex-middle">
-                  <div><input id="{{check.divHelpContent._id}}" class="checkBox" type="checkbox"
+                  <div><input id="{{check.divHelpContent._id}}" class="uk-checkbox" type="checkbox"
                               name="entitiescb[]" value="{{check.divHelpContent._id}}"
                               [(ngModel)]="check.checked">
                   </div>
@@ -95,13 +95,13 @@
 
                 <div class=" uk-flex-center uk-flex">
                   <div class="actions" href="#">
-                    <button (click)="editPageHelpContent(check.divHelpContent._id)" class="uk-button action uk-margin-top uk-flex uk-flex-middle">
-                      <icon name="edit"></icon>
+                    <button (click)="editPageHelpContent(check.divHelpContent._id)" class="uk-button uk-button-secondary uk-margin-top uk-flex uk-flex-middle">
+                      <icon name="edit" [flex]="true"></icon>
                       <span class="uk-margin-small-left">Edit</span>
                     </button>
                     <button (click)="confirmDeletePageHelpContent(check.divHelpContent._id)"
-                         class="uk-button action uk-margin-top uk-flex uk-flex-middle">
-                      <icon name="delete"></icon>
+                         class="uk-button uk-button-danger uk-margin-top uk-flex uk-flex-middle">
+                      <icon name="delete" [flex]="true"></icon>
                       <span class="uk-margin-small-left">Delete</span>
                     </button>
                   </div>
diff --git a/dashboard/entity/entities.component.html b/dashboard/entity/entities.component.html
index a20818e5..34442628 100644
--- a/dashboard/entity/entities.component.html
+++ b/dashboard/entity/entities.component.html
@@ -43,7 +43,7 @@
 			<div
 					class="uk-display-inline"
 					[attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : null"
-					title="Select at least one entity"><input id="checkAll" type="checkbox" (click)="selectAll()"
+					title="Select at least one entity"><input id="checkAll" type="checkbox" (click)="selectAll()" class="uk-checkbox"
 																										[ngModel]="getSelectedEntities().length ==checkboxes.length"/>
 				<span *ngIf="getSelectedEntities().length > 0" class="uk-margin-left uk-text-muted">
 													{{getSelectedEntities().length}} entities selected </span>
@@ -66,8 +66,8 @@
 			</div>
 		</div>
     <div *ngIf="!showLoading">
-      <table *ngIf="checkboxes.length > 0 " class="uk-table uk-table-striped uk-table-hover uk-table-large">
-        <thead class="uk-card-header">
+      <table *ngIf="checkboxes.length > 0 " class="uk-table uk-table-striped uk-table-large">
+        <thead>
         <tr>
           <th class="uk-width-small"></th>
           <th>Name</th>
@@ -78,7 +78,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let check of checkboxes; let i=index">
-          <td><input id="{{check.entity._id}}" class="checkBox" type="checkbox"
+          <td><input id="{{check.entity._id}}" class="uk-checkbox" type="checkbox"
                      name="entitiescb[]" value="{{check.entity._id}}" [(ngModel)]="check.checked">
           </td>
           <td>
diff --git a/dashboard/helpTexts/page-help-content-form.component.html b/dashboard/helpTexts/page-help-content-form.component.html
index 84cfc9a9..5dca4220 100644
--- a/dashboard/helpTexts/page-help-content-form.component.html
+++ b/dashboard/helpTexts/page-help-content-form.component.html
@@ -2,13 +2,9 @@
   <div header>
     <div class="uk-margin-top">
       <a routerLink="../" [queryParams]=" {  'pageId': pageId  }"
-         class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
-         <span class="uk-icon-button uk-icon small uk-button-secondary">
-            <icon name="west"></icon>
-         </span>
-        <span class="space">
-          Go back to page help texts list
-        </span>
+				class="uk-button uk-button-link uk-text-uppercase uk-flex uk-flex-middle">
+				<icon name="west" [flex]="true"></icon>
+        <span class="uk-margin-small-left">Go back to page help texts list</span>
       </a>
     </div>
   </div>
diff --git a/dashboard/helpTexts/page-help-contents.component.html b/dashboard/helpTexts/page-help-contents.component.html
index 9de3c368..1c77da04 100644
--- a/dashboard/helpTexts/page-help-contents.component.html
+++ b/dashboard/helpTexts/page-help-contents.component.html
@@ -65,7 +65,7 @@
             <div class="uk-grid uk-grid-divider uk-padding" uk-grid>
               <div class="uk-width-4-5 ">
                 <div class="uk-grid uk-flex uk-flex-middle">
-                  <div><input id="{{check.pageHelpContent._id}}" class="checkBox" type="checkbox"
+                  <div><input id="{{check.pageHelpContent._id}}" class="uk-checkbox" type="checkbox"
                               name="entitiescb[]" value="{{check.pageHelpContent._id}}" [(ngModel)]="check.checked">
                   </div>
                   <div class="uk-width-expand uk-margin-medium-bottom">
@@ -96,12 +96,12 @@
                 <div class="uk-flex uk-flex-center uk-flex-column uk-height-1-1">
                   <div class="uk-flex uk-flex-center">
                     <div class="actions" href="#">
-                      <button (click)="editPageHelpContent(check.pageHelpContent._id)" class="uk-button action uk-margin-top uk-flex uk-flex-middle">
-                        <icon name="edit"></icon>
+                      <button (click)="editPageHelpContent(check.pageHelpContent._id)" class="uk-button uk-button-secondary uk-margin-top uk-flex uk-flex-middle">
+                        <icon name="edit" [flex]="true"></icon>
                         <span class="uk-margin-small-left">Edit</span>
                       </button>
-                      <button (click)="confirmDeletePageHelpContent(check.pageHelpContent._id)" class="uk-button action uk-margin-top uk-flex uk-flex-middle">
-                        <icon name="delete"></icon>
+                      <button (click)="confirmDeletePageHelpContent(check.pageHelpContent._id)" class="uk-button uk-button-danger uk-margin-top uk-flex uk-flex-middle">
+                        <icon name="delete" [flex]="true"></icon>
                         <span class="uk-margin-small-left">Delete</span>
                       </button>
                     </div>
diff --git a/dashboard/menu/menu.component.html b/dashboard/menu/menu.component.html
index cc561703..b76f9af0 100644
--- a/dashboard/menu/menu.component.html
+++ b/dashboard/menu/menu.component.html
@@ -89,14 +89,14 @@
               <div class="uk-flex uk-flex-center uk-flex-column uk-height-1-1">
                 <div class="uk-flex uk-flex-center">
                   <div class="actions">
-                    <button class="uk-button action uk-margin-top uk-flex uk-flex-middle"
+                    <button class="uk-button uk-button-secondary uk-margin-top uk-flex uk-flex-middle"
                          (click)="editMenuItem(child, true)">
-                      <icon name="edit"></icon>
+                      <icon name="edit" [flex]="true"></icon>
                       <span class="uk-margin-small-left"> Edit</span>
                     </button>
-                    <button class="uk-button action uk-margin-top uk-flex uk-flex-middle"
+                    <button class="uk-button uk-button-danger uk-margin-top uk-flex uk-flex-middle"
                          (click)="confirmDeleteMenuItem(child._id, true)">
-                      <icon name="delete"></icon>
+                      <icon name="delete" [flex]="true"></icon>
                       <span class="uk-margin-small-left"> Delete</span>
                     </button>
                   </div>
diff --git a/dashboard/page/pages.component.html b/dashboard/page/pages.component.html
index 30103b00..3207c6e6 100644
--- a/dashboard/page/pages.component.html
+++ b/dashboard/page/pages.component.html
@@ -40,7 +40,7 @@
 				<div
 						class="uk-display-inline"
 						[attr.uk-tooltip]="getSelectedPages().length == 0 ? 'pos:left; cls: uk-active' : null"
-						title="Select at least one page"><input id="checkAll" type="checkbox" (click)="selectAll()"
+						title="Select at least one page"><input id="checkAll" type="checkbox" (click)="selectAll()" class="uk-checkbox"
 																										[ngModel]="getSelectedPages().length ==checkboxes.length"/>
 					<span *ngIf="getSelectedPages().length > 0" class="uk-margin-left uk-text-muted">
 													{{getSelectedPages().length}} pages selected </span>
@@ -66,7 +66,7 @@
 				<li *ngFor="let check of checkboxes; let i=index" class="uk-card uk-card-default uk-margin-bottom">
 					<div class="uk-grid uk-grid-divider uk-padding" uk-grid>
 						<div class="uk-grid uk-width-expand" uk-grid>
-							<div class=""><input id="{{check.page._id}}" class="checkBox" type="checkbox"
+							<div class=""><input id="{{check.page._id}}" class="uk-checkbox" type="checkbox"
 																	 name="pagescb[]" value="{{check.page._id}}" [(ngModel)]="check.checked">
 							</div>
 							<div class="uk-width-expand">
@@ -118,12 +118,12 @@
 								<div class="uk-flex uk-flex-center">
 									<div class="actions">
 										<button [disabled]="!portal && check.page.portalPid" [attr.uk-tooltip]="((!portal && check.page.portalPid)?'This page belongs to ' + check.page.portalPid:null)"
-														class="uk-button action uk-margin-top uk-flex uk-flex-middle" (click)="editPage(i)">
-											<icon name="edit"></icon>
+														class="uk-button uk-button-secondary uk-margin-top uk-flex uk-flex-middle" (click)="editPage(i)">
+											<icon name="edit" [flex]="true"></icon>
 											<span class="uk-margin-small-left"> Edit</span>
 										</button>
-										<button class="uk-button action uk-margin-top uk-flex uk-flex-middle" (click)="confirmDeletePage(check.page._id)">
-											<icon name="delete"></icon>
+										<button class="uk-button uk-button-danger uk-margin-top uk-flex uk-flex-middle" (click)="confirmDeletePage(check.page._id)">
+											<icon name="delete" [flex]="true"></icon>
 											<span class="uk-margin-small-left"> Delete</span>
 										</button>
 									</div>
diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html
index bd513e87..9e04284c 100644
--- a/dashboard/portal/portals.component.html
+++ b/dashboard/portal/portals.component.html
@@ -48,10 +48,10 @@
           </div>
         </div>
       </div>
-      <table *ngIf="checkboxes.length > 0" class="uk-table uk-table-striped uk-table-hover">
-        <thead class="uk-card-header">
+      <table *ngIf="checkboxes.length > 0" class="uk-table uk-table-striped">
+        <thead>
         <tr>
-          <th><input id="allCommunityCheckbox" type="checkbox" (change)="toggleCheckBoxes($event)"></th>
+          <th><input id="allCommunityCheckbox" type="checkbox" class="uk-checkbox" (change)="toggleCheckBoxes($event)"></th>
           <th>Name</th>
           <th>Type</th>
           <th>Actions</th>
@@ -59,7 +59,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let check of checkboxes; let i=index">
-          <td><input id="{{check.portal._id}}" class="checkBox" type="checkbox"
+          <td><input id="{{check.portal._id}}" class="uk-checkbox" type="checkbox"
                      name="communitiescb[]" value="{{check.portal._id}}" [(ngModel)]="check.checked">
           </td>
           <td>
diff --git a/notifications/notify-form/notify-form.component.ts b/notifications/notify-form/notify-form.component.ts
index ed639680..be9e88dd 100644
--- a/notifications/notify-form/notify-form.component.ts
+++ b/notifications/notify-form/notify-form.component.ts
@@ -14,7 +14,7 @@ declare var UIkit;
   template: `
     <form *ngIf="user && form" [formGroup]="form">
       <ng-template [ngIf]="form.get('notify')">
-        <label><input name="notify" type="checkbox" class="uk-checkbox" formControlName="notify"><span class="uk-margin-xsmall-left">{{label}}</span></label>
+        <label><input name="notify" type="checkbox" class="uk-checkbox" formControlName="notify"><span class="uk-margin-small-left">{{label}}</span></label>
         <div [class.uk-hidden]="!form.get('notify').value" class="uk-position-relative uk-margin-medium-top">
           <div class="notification-user">
             <notification-user [name]="user.firstname" [surname]="user.lastname"></notification-user>