diff --git a/bl-kernel/admin/views/edit-category.php b/bl-kernel/admin/views/edit-category.php
index f47ec19d..b107e65e 100644
--- a/bl-kernel/admin/views/edit-category.php
+++ b/bl-kernel/admin/views/edit-category.php
@@ -2,15 +2,16 @@
 
 <?php echo Bootstrap::formOpen(array('id'=>'jsform')); ?>
 
-<div class="align-middle">
-	<div class="float-right mt-1">
-		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
-		<button type="button" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#jsdeleteModal"><?php $L->p('Delete') ?></button>
-		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>" role="button"><?php $L->p('Cancel') ?></a>
-	</div>
+<div class="d-flex justify-content-between mb-2">
 	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Edit Category'), 'icon'=>'cog')); ?>
+	<div>
+		<button type="submit" class="btn btn-primary" name="save"><?php $L->p('Save') ?></button>
+		<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#jsdeleteModal"><?php $L->p('Delete') ?></button>
+		<a class="btn btn-secondary" href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
 </div>
 
+<div class="card"><div class="card-body">
 <?php
 	// Token CSRF
 	echo Bootstrap::formInputHidden(array(
@@ -68,6 +69,8 @@
 echo Bootstrap::formClose();
 
 ?>
+</div>
+</div>
 
 <!-- Modal for delete category -->
 <?php
diff --git a/bl-kernel/admin/views/new-category.php b/bl-kernel/admin/views/new-category.php
index 071d456c..0ae5e807 100644
--- a/bl-kernel/admin/views/new-category.php
+++ b/bl-kernel/admin/views/new-category.php
@@ -2,14 +2,15 @@
 
 <?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'tab-content')); ?>
 
-<div class="align-middle">
-	<div class="float-right mt-1">
-		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
-		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>" role="button"><?php $L->p('Cancel') ?></a>
+<div class="d-flex justify-content-between mb-2">
+<?php echo Bootstrap::pageTitle(array('title'=>$L->g(string: 'New category'), 'icon'=>'tag')); ?>
+	<div>
+		<button type="submit" class="btn btn-primary" name="save"><?php $L->p('Save') ?></button>
+		<a class="btn btn-secondary" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>" role="button"><?php $L->p('Cancel') ?></a>
 	</div>
-	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('New category'), 'icon'=>'tag')); ?>
 </div>
 
+<div class="card"><div class="card-body">
 <?php
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
@@ -35,5 +36,7 @@
 		'rows'=>3
 	));
 ?>
+</div>
+</div>
 
 <?php echo Bootstrap::formClose(); ?>