diff --git a/templates/access_denied.html b/templates/access_denied.html
index 0bc21c1d8..d47f36262 100644
--- a/templates/access_denied.html
+++ b/templates/access_denied.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
diff --git a/templates/assistant_form_part1.html b/templates/assistant_form_part1.html
index 1fb81315b..a730731f4 100644
--- a/templates/assistant_form_part1.html
+++ b/templates/assistant_form_part1.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 {% load l10n %}
@@ -27,78 +27,79 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-	<li><a href="{% url 'assistant_mandates' %}" id="lnk_assistant_mandates">{% trans 'My mandates' %}</a></li>
-	<li class="active">{% trans 'Renewal application form' %}</li>
+	<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_assistant_mandates">{% trans 'My mandates' %}</a></li>
+	<li class="breadcrumb-item active">{% trans 'Renewal application form' %}
+	</li>
 {% endblock %}
 {% block content %}
 <ul class="nav nav-tabs ">
-	<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-	<li class="active"><a href="#">{% trans 'Administrative' %}</a></li>
-	<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
+	<li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+	<li class="nav-item"><a href="#" class="nav-link active">{% trans 'Administrative' %}</a></li>
+	<li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
 	{% if mandate.assistant_type == "ASSISTANT" %}
-		<li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-		<li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
+		<li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
+		<li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
 	{% endif %}
-	<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-	<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
+	<li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
+	<li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
 </ul>
-<div class="panel panel-default">
-	<div class="panel-body">
+<div class="card border-top-0">
+	<div class="card-body">
  		{% if msg %}
-            <h5><p style="color:red">{{ msg }}</p></h5>
+            <h5><p class="text-danger">{{ msg }}</p></h5>
         {% endif %}
         <form id="pst-form-part1" method="POST" action="{% url 'form_part1_save' %}">
  		{% csrf_token %}
  		{{ form.non_field_errors }}
-		<div class="panel-default">
-  			<div class="panel-heading">
-				<h4>{% trans 'Administrative information' %}</h4>
+		<div class="card border-0">
+  			<div class="card-heading border-bottom">
+				<h4 class="fs-5 my-2">{% trans 'Administrative information' %}</h4>
   			</div>
   		</div>
-		<div class="form-group" style="padding-top: 15px;">
+		<div class="form-group pt-3">
     		<div class="controls" id="person">{{assistant.person}}</div>
     	</div>
-		<div class="panel-default">
-  			<div class="panel-heading">
-				<h4>{% trans 'Contract' %}</h4>
+		<div class="card border-0">
+  			<div class="card-heading border-bottom">
+				<h4 class="fs-5 my-2">{% trans 'Contract' %}</h4>
   			</div>
   		</div>
-  		<div class="form-group" style="padding-top: 15px;">
-			<label style="padding-top: 5px" for="renewal_type">{% trans 'Renewal type' %}
+  		<div class="form-group pt-3">
+			<label class="pt-2" for="renewal_type">{% trans 'Renewal type' %}
 			</label>
 			<div class="controls" id="renewal_type">
 				{% trans mandate.renewal_type %}
 			</div>
 			{% for structure in mandate.mandatestructure_set.all|dictsort:"id" %}
-				<label style="padding-top: 15px" for="structures">
+				<label class="pt-3" for="structures">
 					{% trans structure.structure.type|lower %}</label>
 				<div class="controls" id="structures">{{structure.structure.acronym}}</div>
       		{% endfor %}
-			<label style="padding-top: 15px" for="full_time_equivalent">
+			<label class="pt-3" for="full_time_equivalent">
 				{% trans 'Full-time equivalent' %}</label>
 			<div class="controls" id="full_time_equivalent">{{mandate.fulltime_equivalent}}</div>
-      		<label style="padding-top: 15px" for="date_of_first_nomination">
+      		<label class="pt-3" for="date_of_first_nomination">
 				{% trans 'Date of first nomination' %}</label>
       		<div class="controls" id="date_of_first_nomination">{{mandate.entry_date}}</div>
-      		<label  style="padding-top: 15px" for="field">{% trans 'Mandate type' %}</label>
+      		<label class="pt-3" for="field">{% trans 'Mandate type' %}</label>
 			<div class="controls" id="field">
 				{% trans mandate.assistant_type %}
 			</div>
       	</div>
-    	<div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Miscellaneous' %}</h4>
+    	<div class="card border-0">
+  			<div class="card-heading border-bottom">
+  				<h4 class="fs-5 my-2">{% trans 'Miscellaneous' %}</h4>
     		</div>
     	</div>
     	<div class="form-group">
-			<label style="padding-top: 5px" for="function_outside_university">
+			<label class="pt-2" for="function_outside_university">
 				{% trans 'Current positions outside the University and % of time spent' %}
 			</label>
 			{{ form.external_functions }}
 			<span class="error">{{ form.errors.external_functions }}</span>
 		</div>
 		<div class="form-group">
-			<label style="padding-top: 5px" for="external_post">
+			<label class="pt-2" for="external_post">
 				{% trans 'Mandate requested externally (FNRS, FRIA, ...)' %}
 			</label>
 			{{ form.external_contract }}
@@ -114,7 +115,7 @@ <h4>{% trans 'Miscellaneous' %}</h4>
             </div>
         {% endif %}
         <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_pstform_part1_save">
-            <span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}
+            <i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}
         </button>
 		<input type="hidden" name="mandate_id" value="{{ mandate.id }}">
     </form>
diff --git a/templates/assistant_form_part3.html b/templates/assistant_form_part3.html
index 928d66581..39b6a5180 100644
--- a/templates/assistant_form_part3.html
+++ b/templates/assistant_form_part3.html
@@ -1,8 +1,8 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 {% load l10n %}
-{% load bootstrap3 %}
+{% load django_bootstrap5 %}
 
 {% comment "License" %}
 * OSIS stands for Open Student Information System. It's an application
@@ -31,23 +31,23 @@
 <link rel="stylesheet" href="{% static 'css/jquery-ui.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
-<li class="active">{% trans 'Renewal application form' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
 {% endblock %}
 {% block content %}
 <ul class="nav nav-tabs ">
-<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
-<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
-<li class="active"><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-<li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
-<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
-</ul>
-<div class="panel panel-default">
-	<div class="panel-body">
+    <li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
+    <li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link active">{% trans 'Ph.D.' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
+    </ul>
+<div class="card">
+	<div class="card-body">
         {% if msg %}
-            <h5><p style="color:red">{{ msg }}</p></h5>
+            <h5><p class="text-danger">{{ msg }}</p></h5>
         {% endif %}
  		<form id="pst-form-part3" method="POST" enctype="multipart/form-data" action="{% url 'form_part3_save' %}">
  		{{ form.non_field_errors }}
@@ -55,9 +55,9 @@ <h5><p style="color:red">{{ msg }}</p></h5>
  		{% for hidden in form.hidden_fields %}
 			{{ hidden }}
 		{% endfor %}
- 		<div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Ph.D.' %}</h4>
+ 		<div class="card border-0">
+  			<div class="card-heading border-bottom">
+  				<h4 class="fs-5 my-2">{% trans 'Ph.D.' %}</h4>
     		</div>
     	</div>
     	<div class="form-group">
@@ -108,29 +108,29 @@ <h4>{% trans 'Ph.D.' %}</h4>
                 {{ form.remark }}
                 <span class="error">{{ form.remark.errors }}</span>
         </div>
-        <div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Report of the steering committee (mandatory from the second renewal application)' %}</h4>
+        <div class="card border-0">
+  			<div class="card-heading border-bottom">
+  				<h4 class="fs-5 my-2">{% trans 'Report of the steering committee (mandatory from the second renewal application)' %}</h4>
     		</div>
     	</div>
         {% for file in files %}
-            <div class="row" style="padding-top: 15px;">
-                <div class="col-md-2" style="text-align: left">
-                    <a class="btn btn-default btn-danger btn-sm" id="btn_delete_file" style="margin-right: 5px;"
+            <div class="row pt-3">
+                <div class="col-lg-2" style="text-align: left">
+                    <a class="btn btn-danger btn-md me-2" id="btn_delete_file"
                        title="{% trans 'Delete file'%}"
                        onclick="location.href='{% url 'assistant_file_delete' file.id 'form_part3_edit' %}';">
-                    <span class="fas fa-times" aria-hidden="true" id="spn_delete_file"></span>
+                    <i class="fas fa-times" aria-hidden="true" id="spn_delete_file"></i>
                         {% trans 'Delete' %}</a>
                 </div>
-                <div class="col-md-10" id="hdn_filename" style="text-align: left">
+                <div class="col-lg-10 text-start" id="hdn_filename">
                    <a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">{{ file.document_file }}</a>
                 </div>
             </div>
         {% endfor %}
-		<div class="form-group" style="padding-top: 15px;">
-			<a class="btn btn-default" data-toggle="modal" data-target="#pnl_upload_documents"
-               id="btn_add_file" style="margin-right: 5px;" title="{% trans 'Add file'%}">
-                <span class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></span>
+		<div class="form-group pt-3">
+			<a class="btn btn-default me-2" data-bs-toggle="modal" data-bs-target="#pnl_upload_documents"
+               id="btn_add_file" title="{% trans 'Add file'%}">
+                <i class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></i>
                 {% trans 'Attach a PDF file' %}</a>
 		</div>
         <hr>
@@ -141,7 +141,7 @@ <h4>{% trans 'Report of the steering committee (mandatory from the second renewa
 		<div class="form-group">
      			<button type="submit" class="btn btn-primary" title="{% trans 'Save'%}"
                         id="bt_pstform_part3_save">
-     			<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+     			<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
 		</div>
         {{ form.media }}
     	</form>
diff --git a/templates/assistant_form_part4.html b/templates/assistant_form_part4.html
index 7588ae6f6..eab431251 100644
--- a/templates/assistant_form_part4.html
+++ b/templates/assistant_form_part4.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 {% load l10n %}
@@ -27,27 +27,27 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
-<li class="active">{% trans 'Renewal application form' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
 {% endblock %}
 {% block content %}
 <ul class="nav nav-tabs ">
-<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
-<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
-<li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-<li class="active"><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
-<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
+    <li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
+    <li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link active">{% trans 'Research' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
 </ul>
-<div class="panel panel-default">
-	<div class="panel-body">
+<div class="card">
+	<div class="card-body">
  		<form id="pst-form-part4" method="POST" enctype="multipart/form-data" action="{% url 'form_part4_save' %}">
  		{% csrf_token %}
  		{{ form.non_field_errors }}
- 		<div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Research' %}</h4>
+ 		<div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Research' %}</h4>
     		</div>
     	</div>
     	<div class="form-group" style="padding-top: 10px">
@@ -80,29 +80,29 @@ <h4>{% trans 'Research' %}</h4>
             {{ form.remark }}
             <span class="error">{{ form.remark.errors }}</span>
       	</div>
-    	<div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'List of publications in PDF format (DIAL)' %}</h4>
+          <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'List of publications in PDF format (DIAL)' %}</h4>
     		</div>
     	</div>
         {% for file in files %}
-            <div class="row" style="padding-top: 15px;">
-                <div class="col-md-2" style="text-align: left">
-                    <a class="btn btn-default btn-danger btn-sm" id="btn_delete_file" style="margin-right: 5px;"
+            <div class="row pt-3">
+                <div class="col-lg-2" style="text-align: left">
+                    <a class="btn btn-danger btn-md me-2" id="btn_delete_file"
                        title="{% trans 'Delete'%}"
                        onclick="location.href='{% url 'assistant_file_delete' file.id 'form_part4_edit' %}';">
-                    <span class="fas fa-times" aria-hidden="true" id="spn_delete_file"></span>
+                    <i class="fas fa-times" aria-hidden="true" id="spn_delete_file"></i>
                         {% trans 'Delete file' %}</a>
                 </div>
-                <div class="col-md-10" id="hdn_filename" style="text-align: left">
+                <div class="col-lg-10 text-start" id="hdn_filename">
                    <a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">{{ file.document_file }}</a>
                 </div>
             </div>
         {% endfor %}
-        <div class="row" style="padding-top: 15px; padding-left: 15px;">
-            <a class="btn btn-default" data-toggle="modal" data-target="#pnl_upload_documents"
-               id="btn_add_file" style="margin-right: 5px;" title="{% trans 'Add file'%}">
-                <span class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></span>
+        <div class="row px-3">
+            <a class="btn btn-default me-2" data-bs-toggle="modal" data-bs-target="#pnl_upload_documents"
+               id="btn_add_file" title="{% trans 'Add file'%}">
+                <i class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></i>
                 {% trans 'Attach a PDF file' %}</a>
         </div>
         <hr>
@@ -110,7 +110,7 @@ <h4>{% trans 'List of publications in PDF format (DIAL)' %}</h4>
 		   name="mandate_id" title="mandate_id" >
         <input type="hidden" value="{{ document_type }}" id="hdn_description" name="description" title="description">
         <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_pstform_part3_save">
-     	<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+     	<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
     	</form>
 	</div>
 </div>
diff --git a/templates/assistant_form_part5.html b/templates/assistant_form_part5.html
index 5188594b1..3dffcea76 100644
--- a/templates/assistant_form_part5.html
+++ b/templates/assistant_form_part5.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 {% load l10n %}
@@ -27,34 +27,34 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
-<li class="active">{% trans 'Renewal application form' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
 {% endblock %}
 {% block content %}
 <ul class="nav nav-tabs ">
-<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
-<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
-{% if mandate.assistant_type == "ASSISTANT" %}
-    <li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-    <li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
-{% endif %}
-<li class="active"><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
+    <li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
+    <li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
+    {% if mandate.assistant_type == "ASSISTANT" %}
+        <li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
+        <li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
+    {% endif %}
+    <li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link active">{% trans 'Activities' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
 </ul>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
         {% if msg %}
-            <h5><p style="color:red">{{ msg }}</p></h5>
+            <h5><p class="text-danger">{{ msg }}</p></h5>
         {% endif %}
         <form id="pst-form-part5" method="POST" action="{% url 'form_part5_save' %}">
         {% csrf_token %}
         {{ form.non_field_errors }}
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Representation activities at UCL' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Representation activities at UCL' %}</h4>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <h6>{% trans 'Please enter the number of hours per year' %}</h6>
             </div>
         </div>
@@ -88,11 +88,11 @@ <h6>{% trans 'Please enter the number of hours per year' %}</h6>
             {{ form.corsci_representation }}
             <span class="error">{{ form.corsci_representation.errors }}</span>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Service activities' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Service activities' %}</h4>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <h6>{% trans 'Please enter the number of hours per year' %}</h6>
             </div>
         </div>
@@ -100,44 +100,44 @@ <h6>{% trans 'Please enter the number of hours per year' %}</h6>
             <label for="{{ form.students_service.id_for_label }}">
                 {% trans 'Information for future students (CIO, shows, Campus Days, Midi Masters,...)' %}</label>
             {{ form.students_service }}
-            <font class="error">{{ form.students_service.errors }}</font>
+            <span class="error">{{ form.students_service.errors }}</span>
             </div>
         <div class="form-group">
             <label for="{{ form.infrastructure_mgmt_service.id_for_label }}">
                 {% trans 'Management of collective facilities (lab, workshop, library, IT department, website,...)' %}</label>
             {{ form.infrastructure_mgmt_service }}
-            <font class="error">{{ form.infrastructure_mgmt_service.errors }}</font>
+            <span class="error">{{ form.infrastructure_mgmt_service.errors }}</span>
             </div>
         <div class="form-group">
             <label for="{{ form.events_organisation_service.id_for_label }}">
                 {% trans "Organization of seminars, conferences, visits, study tours, grounds, seminars... (not taken in account in the 'Teaching units' section)" %}</label>
             {{ form.events_organisation_service }}
-            <font class="error">{{ form.events_organisation_service.errors }}</font>
+            <span class="error">{{ form.events_organisation_service.errors }}</span>
         </div>
         <div class="form-group">
             <label for="{{ form.publishing_field_service.id_for_label }}">
                 {% trans 'Activities in the field of publishing (editorial board,...)' %}</label>
             {{ form.publishing_field_service }}
-            <font class="error">{{ form.publishing_field_service.errors }}</font>
+            <span class="error">{{ form.publishing_field_service.errors }}</span>
         </div>
         <div class="form-group">
             <label for="{{ form.scientific_jury_service.id_for_label }}">
                 {% trans 'Participation in juries and/or scientific committees' %}</label>
             {{ form.scientific_jury_service }}
-            <font class="error">{{ form.scientific_jury_service.errors }}</font>
+            <span class="error">{{ form.scientific_jury_service.errors }}</span>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Training activities' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Training activities' %}</h4>
             </div>
         </div>
         <div class="form-group">
-            <label style="padding-top: 5px" for="{{ form.formations.id_for_label }}">{% trans 'Scientific, pedagogical or other training you have attended...(LLL, SMCS, RHUM, Summer School)' %}</label>
+            <label class="pt-2" for="{{ form.formations.id_for_label }}">{% trans 'Scientific, pedagogical or other training you have attended...(LLL, SMCS, RHUM, Summer School)' %}</label>
             <div class="controls">{{ form.formations }}</div>
-            <font class="error">{{ form.formations.errors }}</font>
+            <span class="error">{{ form.formations.errors }}</span>
         </div>
         <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_pstform_part5_save">
-            <span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+            <i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
         <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
         </form>
     </div>
diff --git a/templates/assistant_form_part6.html b/templates/assistant_form_part6.html
index a91e8e21b..9046966d2 100644
--- a/templates/assistant_form_part6.html
+++ b/templates/assistant_form_part6.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 {% load l10n %}
@@ -27,25 +27,25 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
-<li class="active">{% trans 'Renewal application form' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
 {% endblock %}
 {% block content %}
 <ul class="nav nav-tabs ">
-<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
-<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
-{% if mandate.assistant_type == "ASSISTANT" %}
-    <li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-    <li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
-{% endif %}
-<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-<li class="active"><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
+    <li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
+    <li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
+    {% if mandate.assistant_type == "ASSISTANT" %}
+        <li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
+        <li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
+    {% endif %}
+    <li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link active">{% trans 'Summary' %}</a></li>
 </ul>
-    <div class="panel panel-default">
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-body">
             {% if msg %}
-            <h5><p style="color:red">{{ msg }}</p></h5>
+            <h5><p class="text-danger">{{ msg }}</p></h5>
         {% endif %}
         <form id="pst-form-part6" method="POST" action="{% url 'form_part6_save' %}">
         <span class="error">{{ form.non_field_errors }}</span>
@@ -53,11 +53,11 @@ <h5><p style="color:red">{{ msg }}</p></h5>
  		{% for hidden in form.hidden_fields %}
 			{{ hidden }}
 		{% endfor %}
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Summary' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Summary' %}</h4>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <h6>{% trans 'The total must be equal to 100' %}</h6>
             </div>
         </div>
@@ -89,9 +89,9 @@ <h6>{% trans 'The total must be equal to 100' %}</h6>
             {{ form.formation_activities_percent }}
             <span class="error">{{ form.formation_activities_percent.errors }}</span>
         </div>
-            <div class="panel-default">
-                <div class="panel-heading">
-                    <h4>{% trans 'General comment' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'General comment' %}</h4>
                 </div>
             </div>
             <div class="form-group">
@@ -106,13 +106,13 @@ <h3><strong>
             <div class="btn-toolbar">
                 <button type="submit" class="btn btn-primary"
                         title="{% trans 'Save' %}" id="bt_pstform_part6_save">
-                    <span class="far fa-save" aria-hidden="true"></span> {% trans 'Save' %}
+                    <i class="far fa-save" aria-hidden="true"></i> {% trans 'Save' %}
                 </button>
                 <button type="submit" class="btn btn-success" title="{% trans 'Validate and submit' %}"
                         id="bt_pstform_validate_and_submit" name="validate_and_submit"
                         onclick="return confirm('{% trans 'Are you sure you want to validate and submit? This action is irreversible.' %}')">
-                <span class="fas fa-check" aria-hidden="true">
-                </span> {% trans 'Validate and submit' %}
+                <i class="fas fa-check" aria-hidden="true">
+                </i> {% trans 'Validate and submit' %}
                 </button>
             </div>
             <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
diff --git a/templates/assistant_mandates.html b/templates/assistant_mandates.html
index ecb281ed2..845d769b0 100644
--- a/templates/assistant_mandates.html
+++ b/templates/assistant_mandates.html
@@ -1,7 +1,7 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
-{
+
 
 {% comment "License" %}
 * OSIS stands for Open Student Information System. It's an application
@@ -29,18 +29,18 @@
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
 {% endblock %}
-    
+
 {% block breadcrumb %}
-<li class="active">{% trans 'List of mandates' %}</li>
+<li class="breadcrumb-item active">{% trans 'List of mandates' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h2>{% trans 'Assistant mandate renewal application' %}</h2>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
 		<h3>{{ assistant.person }}</h3>
-		<div class="table-responsive">  
+		<div class="table-responsive">
 		<table id="myTable" class="table table-hover" cellspacing="0" width="100%">
 		<thead><tr>
       	<th>{% trans 'Academic year' %}</th>
@@ -56,7 +56,7 @@ <h3>{{ assistant.person }}</h3>
 			<tr>
 			<form method="post" action=" {% url 'mandate_change_state' %} ">
 			{% csrf_token %}
-			<td>{{ mandate.academic_year }}</td>	
+			<td>{{ mandate.academic_year }}</td>
 			<td>
                 <ul>
                     {% for entity in mandate.entities %}
@@ -68,41 +68,41 @@ <h3>{{ assistant.person }}</h3>
             </td>
 			<td>{{ mandate.fulltime_equivalent }}</td>
             <td>{% trans mandate.get_state_display %}</td>
-			<td align="center">
+			<td class="text-center">
 			{% if mandate.state == "TO_DO" %}
 				<button type="submit" class="btn btn-success" title="{% trans 'Accept'%}" id="bt_mandate_accept"
 						name="bt_mandate_accept" onclick="return confirm('{% trans 'Are you sure you want to accept the renewal request? This action is irreversible.' %}')">
-					<span class="fas fa-check-circle" aria-hidden="true"></span> {% trans 'Accept'%}</button>
+					<i class="fas fa-check-circle" aria-hidden="true"></i> {% trans 'Accept'%}</button>
 				<button type="submit" class="btn btn-danger" title="{% trans 'Refuse'%}" id="bt_mandate_decline"
 						name="bt_mandate_decline" onclick="return confirm('{% trans 'Are you sure you want to decline the renewal request? This action is irreversible.' %}')">
-					<span class="fas fa-times-circle" aria-hidden="true"></span> {% trans 'Refuse'%}
+					<i class="fas fa-times-circle" aria-hidden="true"></i> {% trans 'Refuse'%}
 				</button>
 			{% elif mandate.state == "TRTS" and mandate.academic_year == current_academic_year and not can_see_file %}
 				<a href="{% url 'form_part1_edit' %}">
                     <button type="button" class="btn btn-link btn-lg" title="{% trans 'Edit'%}" id="bt_mandate_edit">
-                        <span class="far fa-edit" aria-hidden="true"></span> {% trans 'Edit'%}
+                        <i class="far fa-edit" aria-hidden="true"></i> {% trans 'Edit'%}
                     </button></a>
             {% elif mandate.state == "DONE"  and can_see_file %}
                 <a href="{% url 'assistant_mandate_reviews' mandate.id %}">
                 <button type="button" class="btn btn-link btn-lg" title="{% trans 'View'%}" id="bt_view">
-                    <span class="far fa-eye" aria-hidden="true"></span> {% trans 'View' %}
+                    <i class="far fa-eye" aria-hidden="true"></i> {% trans 'View' %}
                 </button></a>
             {% else %}
                 <button type="button" class="btn btn-link btn-lg" title="{% trans 'View'%}" id="bt_nothing" disabled>
-                    <span class="fas fa-eye-slash" aria-hidden="true"></span>
+                    <i class="fas fa-eye-slash" aria-hidden="true"></i>
                 </button>
 			{% endif %}
             <input type="hidden" value="{{mandate.id | default_if_none:''}}" id="hdn_current_mandate_id"
                    name="mandate_id" title="mandate_id" >
 			</form>
 			</td>
-			<td align="right">
+			<td class="text-end">
                 {% if mandate.state != "TO_DO" and mandate.state != "DECLINED" %}
                     <form method="POST" action="{% url 'export_mandate_pdf' %}">
                         {% csrf_token %}
                         <button type="submit" class="btn btn-link btn-lg no_spinner" title="{% trans 'Generate a PDF file' %}"
                                 id="bt_generate_pdf">
-                            <span class="far fa-file-download-file" aria-hidden="true"></span> PDF
+                            <i class="far fa-file-download-file" aria-hidden="true"></i> PDF
                         </button>
                         <input type="hidden" value="{{mandate.id | default_if_none:''}}" id="hdn_mandate_id"
                             name="mandate_id" title="mandate_id" >
diff --git a/templates/export_declined_mandates.html b/templates/export_declined_mandates.html
index 7f689f199..adfba6545 100644
--- a/templates/export_declined_mandates.html
+++ b/templates/export_declined_mandates.html
@@ -1,6 +1,6 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static i18n%}
-{% load bootstrap3 %}
+{% load django_bootstrap5 %}
 
 {% comment "License" %}
 * OSIS stands for Open Student Information System. It's an application
@@ -29,25 +29,25 @@
     <link rel="stylesheet" href="{% static 'css/custom.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-    <li><a href="{% url 'institution' %}" id="lnk_institution">{% trans 'Institution' %}</a></li>
-    <li><a href="{% url 'mandates' %}" id="lnk_mandates">{% trans 'Mandates' %}</a></li>
-    <li><a href="{% url 'assistants_home' %}" id="lnk_mandates">{% trans 'Assistants' %}</a></li>
-    <li class="active">{% trans 'Export of the declined assistants mandates' %}</li>
+    <li class="breadcrumb-item"><a href="{% url 'institution' %}" id="lnk_institution">{% trans 'Institution' %}</a></li>
+    <li class="breadcrumb-item"><a href="{% url 'mandates' %}" id="lnk_mandates">{% trans 'Mandates' %}</a></li>
+    <li class="breadcrumb-item"><a href="{% url 'assistants_home' %}" id="lnk_mandates">{% trans 'Assistants' %}</a></li>
+    <li class="breadcrumb-item active">{% trans 'Export of the declined assistants mandates' %}</li>
 {% endblock %}
 {% block content %}
     <div class="page-header">
         <h3>{% trans 'Export of the declined assistants mandates' %}</h3>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-body">
             <form method="get" action="{% url 'download_declined_mandates_pdf' %} ">
                 <div class="row">
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {% bootstrap_field form.academic_year show_label=False %}
                     </div>
-                    <div class="col-md-2">
+                    <div class="col-lg-2">
                         {% trans 'Export' as trans_export %}
-                        {% bootstrap_button button_type='submit' icon='glyphicon glyphicon-floppy-open' content=trans_export button_class='btn-default no_spinner'%}
+                        {% bootstrap_button button_type='submit' icon='fa-solid fa-file-arrow-up' content=trans_export button_class='btn-default no_spinner'%}
                     </div>
                 </div>
 
diff --git a/templates/load_mandates.html b/templates/load_mandates.html
index d2b04c85b..fa5300e37 100644
--- a/templates/load_mandates.html
+++ b/templates/load_mandates.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 {% load messages %}
@@ -30,18 +30,18 @@
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li class="active">{% trans 'Import assistant mandates' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Import assistant mandates' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %}</h3>
     <h5>{% trans 'Importing files from an XLSX file'%}</h5>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
     {% if imported_mandates >= 0 or updated_mandates >= 0 %}
-        <div class="form-group" style="padding-top: 5px;">
+        <div class="form-group pt-2">
             <ul>
                 <li>{{ imported_assistants }} assistants importés.</li>
                 <li>{{ updated_assistants }} assistants mis à jour.</li>
@@ -58,10 +58,10 @@ <h5>{% trans 'Importing files from an XLSX file'%}</h5>
          {% endfor %}
          </ul>
      {% endif %}
-            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#pnl_upload_mandates_modal"
+            <button type="button" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#pnl_upload_mandates_modal"
                     id="btn_upload_mandates_modal"
                     title="{% trans 'Select Excel file to inject mandates' %}">
-                <span class="fas fa-arrow-circle-up" aria-hidden="true"></span> {% trans 'Inject xls file' %}
+                <i class="fas fa-arrow-circle-up" aria-hidden="true"></i> {% trans 'Inject xls file' %}
             </button>
 
 	</div>
@@ -73,9 +73,8 @@ <h5>{% trans 'Importing files from an XLSX file'%}</h5>
             <form method="post" enctype="multipart/form-data" action="{% url 'upload_mandates_file' %}">
                 {% csrf_token %}
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"
-                            id="bt_close_upload_mandates_modal"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="uploadMandatesLabel">{% trans 'Assistant mandates importation' %}</h4>
+                    <h4 class="modal-title"  id="uploadMandatesLabel">{% trans 'Assistant mandates importation' %}</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"  id="bt_close_upload_mandates_modal"></button>
                 </div>
                 <div class="modal-body">
                     <label for="file_mandates_input_file" class="btn btn-default" >{% trans 'Choose a file' %}</label>
@@ -84,7 +83,7 @@ <h4 class="modal-title" id="uploadMandatesLabel">{% trans 'Assistant mandates im
                     <p class="help-block">{% trans 'Please select the XLSX file' %}</p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal"
                             id="bt_cancel_upload_mandates_modal">{% trans 'Cancel' %}</button>
                     <input type="submit" class="btn btn-primary" value="{% trans 'Inject'%}"
                            onclick="document.getElementById('files').style.visibility='visible'"
diff --git a/templates/manager_add_reviewer.html b/templates/manager_add_reviewer.html
index 078bcb93d..7c8e16d56 100644
--- a/templates/manager_add_reviewer.html
+++ b/templates/manager_add_reviewer.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,20 +27,20 @@
 {% endcomment %}
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-<link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 <link rel="stylesheet" href="{% static 'css/jquery-ui.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li><a href="{% url 'reviewers_list' %}" id="lnk_reviewers_list">{% trans 'Reviewers' %}</a></li>
-<li class="active">{% trans 'Add' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'reviewers_list' %}" id="lnk_reviewers_list">{% trans 'Reviewers' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Add' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
         <form method="POST" action="{% url 'reviewer_add' %}">
         {{ form.non_field_errors }}
  		    {% csrf_token %}
@@ -64,9 +64,9 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
 		<input type="hidden" name="reviewer_id" id="reviewer.id" value="{{ reviewer.id }}">
 		<button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_add_reviewer_save"
 				onclick="return confirm('{% trans 'Are you sure you want to add this reviewer? This action is irreversible.' %}')">
-			<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+			<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
 			<a class="btn btn-default" id="lnk_upload_cancel" href="{% url 'reviewers_list' %}">
-				<span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel'%}</a>
+				<i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel'%}</a>
     	</form>
     </div>
 </div>
diff --git a/templates/manager_assistant_form_view.html b/templates/manager_assistant_form_view.html
index 8de4d9c7a..f04d21027 100644
--- a/templates/manager_assistant_form_view.html
+++ b/templates/manager_assistant_form_view.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -29,180 +29,180 @@
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li><a href="{% url 'mandates_list' %}" id="lnk_assistants">{% trans 'List of mandates' %}</a></li>
-<li class="active">{% trans 'Assistant file' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'mandates_list' %}" id="lnk_assistants">{% trans 'List of mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Assistant file' %}</li>
 {% endblock %}
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year }} </h3>
     <ul class="nav nav-tabs">
-        <li>
+        <li class="nav-item">
             <form id=mandate_id method="POST" action="{% url 'mandate_read' %}">
                 {{ form.non_field_errors }}
                 {% csrf_token %}
                 <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
-                <button type="submit" class="btn btn-link" title="{% trans 'Administrative data'%}">
+                <button type="submit" class="btn btn-link nav-link" title="{% trans 'Administrative data'%}">
                     {% trans 'Administrative data'%}
                 </button>
             </form>
         </li>
-        <li class="active"><a href="#">{% trans 'Assistant file' %}</a></li>
-        <li><a href="{% url 'manager_reviews_view' mandate_id=mandate.id %}">{% trans 'Workflow and reviews' %}</a></li>
+        <li class="nav-item"><a href="#" class="nav-link active">{% trans 'Assistant file' %}</a></li>
+        <li class="nav-item"><a href="{% url 'manager_reviews_view' mandate_id=mandate.id %}" class="nav-link">{% trans 'Workflow and reviews' %}</a></li>
     </ul>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card border-top-0">
+    <div class="card-body">
         <h3>{{ mandate.assistant.person }} ({{ mandate.assistant.person.gender }})</h3>
-  		<div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Contract' %}</h4>
+  		<div class="card border-0 border-bottom">
+  			<div class="card-heading">
+  				<h4 class="my-2 fs-5">{% trans 'Contract' %}</h4>
   			</div>
   		</div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Renewal type' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.get_renewal_type_display }}
                 </div>
             </div>
             {% if mandate.renewal_type == assistant_mandate_renewal.EXCEPTIONAL %}
-                <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+                <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Justification' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.justification}}
                 </div>
             </div>
             {% endif %}
             {% for this_entity in entities %}
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans this_entity.entity_type %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{this_entity.acronym}}
                     </div>
                 </div>
             {% endfor %}
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Full-time equivalent' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.fulltime_equivalent}}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Date of first nomination' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.entry_date}}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Mandate type' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.get_assistant_type_display }}
                 </div>
             </div>
         </div>
   		{% if mandate.assistant_type == assistant_type.ASSISTANT %}
-            <div class="panel-default">
-  			    <div class="panel-heading">
-  				    <h4>{% trans 'Ph.D.' %}</h4>
+            <div class="card border-0 border-bottom">
+  			    <div class="card-heading">
+  				    <h4 class="my-2 fs-5">{% trans 'Ph.D.' %}</h4>
     		    </div>
     	    </div>
-            <div class="form-group" style="padding-top: 10px;">
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+            <div class="form-group pt-2">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Enrolled in the Ph.D. program' %}
                     </div>
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {% if assistant.inscription %}
                             {{ assistant.get_inscription_display }}
                         {% else %}
                             n/a
                         {% endif %}
                     </div>
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {% trans 'Scheduled date of registration' %}
                     </div>
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {{ assistant.expected_phd_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Promoter' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.supervisor|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Ph.D. date' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.phd_inscription_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Programmed date of confirmation test' %}
                         <h6>{% trans '(starting the 2nd renewal)' %}</h6>
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.confirmation_test_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Date of succeeded confirmation test' %}
                         <h6>{% trans '(starting the 2nd renewal)' %}</h6>
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.succeed_confirmation_test_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Date of defense of thesis (if already known)' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.thesis_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Title (provisional) of the thesis' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.thesis_title|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Remark' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.remark|default_if_none:"n/a" }}
                     </div>
                 </div>
             </div>
             {% if phd_files.all %}
-                <div style="padding-top: 10px;">
+                <div class="pt-2">
                     {% trans 'Report of the steering committee (mandatory from the second renewal application)' %}
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <ul>
+                <div class="row">
+                    <ul class="ps-5">
                         {% for file in phd_files %}
                             <li>
                                 <a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">
@@ -212,66 +212,66 @@ <h6>{% trans '(starting the 2nd renewal)' %}</h6>
                     </ul>
                 </div>
             {% endif %}
-            <div class="panel-default">
-  			        <div class="panel-heading">
-  				        <h4>{% trans 'Research' %}</h4>
+            <div class="card border-0 border-bottom">
+  			        <div class="card-heading">
+  				        <h4 class="my-2 fs-5">{% trans 'Research' %}</h4>
     		        </div>
             </div>
-            <div class="form-group" style="padding-top: 10px;">
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+            <div class="form-group pt-2">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Scientific stay(s) and/or course(s)' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.internships|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Conference(s) to which I have contributed by communication or post, alone or with others.' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.conferences|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Publication(s) in preparation' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.publications|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Prize(s) and/or distinction(s)' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.awards|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Participation in thesis and/or dissertation' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.framing|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row">
+                    <div class="col-lg-3">
                         {% trans 'Remark' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.remark|default_if_none:"n/a" }}
                     </div>
                 </div>
             </div>
             {% if research_files.all %}
-                <div style="padding-top: 10px;">
+                <div class="pt-2">
                     {% trans 'List of publications in PDF format (DIAL)' %}
                 </div>
-                <div class="row" style="padding-top: 2px;">
+                <div class="row">
                     <ul>
                         {% for file in research_files %}
                         <li>
@@ -283,35 +283,35 @@ <h4>{% trans 'Research' %}</h4>
                 </div>
             {% endif %}
         {% endif %}
-        <div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Miscellaneous' %}</h4>
+        <div class="card border-0 border-bottom">
+  			<div class="card-heading">
+  				<h4 class="my-2 fs-5">{% trans 'Miscellaneous' %}</h4>
     		</div>
     	</div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-4">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-4">
                     {% trans 'Current positions outside the University and % of time spent' %}
                 </div>
-                <div class="col-md-8">
+                <div class="col-lg-8">
                     {{ mandate.external_functions|default_if_none:"n/a" }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-4">
+            <div class="row">
+                <div class="col-lg-4">
                     {% trans 'Mandate requested externally (FNRS, FRIA, ...)' %}
                 </div>
-                <div class="col-md-8">
+                <div class="col-lg-8">
                     {{ mandate.external_contract|default_if_none:"n/a" }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Course units' %}</h4>
+        <div class="card border-0 border-bottom">
+            <div class="card-heading">
+                <h4 class="my-2 fs-5">{% trans 'Course units' %}</h4>
             </div>
         </div>
-        <div class="table-responsive" style="padding-top: 10px;">
+        <div class="table-responsive">
             <table id="myTable" class="table table-striped table-condensed table-bordered" cellspacing="0" width="100%">
             <thead>
                 <tr>
@@ -346,10 +346,10 @@ <h4>{% trans 'Course units' %}</h4>
             </table>
         </div>
         {% if tutoring_files.all %}
-            <div style="padding-top: 10px;">
+            <div class="pt-2">
                 {% trans 'Evaluations (optional)' %}
             </div>
-            <div class="row" style="padding-top: 2px;">
+            <div class="row">
                 <ul>
                     {% for file in tutoring_files %}
                         <li>
@@ -360,169 +360,169 @@ <h4>{% trans 'Course units' %}</h4>
                 </ul>
             </div>
         {% endif %}
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Representation activities at UCL' %}</h4>
+        <div class="card border-0 border-bottom">
+            <div class="card-heading">
+                <h4 class="my-2 fs-5">{% trans 'Representation activities at UCL' %}</h4>
                 <h6>({% trans 'number of hours per year' %})</h6>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Within the faculty (program committees, faculty board, faculty council)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.faculty_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Within the institute (institute board, institute council,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.institute_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Within the sector (board and/or council)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.sector_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Within the organs of the University (academic council, other councils or commissions,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.governing_body_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Within the CORSCI' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.corsci_representation }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Service activities' %}</h4>
+        <div class="card border-0 border-bottom">
+            <div class="card-heading">
+                <h4 class="my-2 fs-5">{% trans 'Service activities' %}</h4>
                 <h6> ({% trans 'number of hours per year' %})</h6>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Information for future students (CIO, shows, Campus Days, Midi Masters,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.students_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Management of collective facilities (lab, workshop, library, IT department, website,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.infrastructure_mgmt_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans "Organization of seminars, conferences, visits, study tours, grounds, seminars... (not taken in account in the 'Teaching units' section)" %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.events_organisation_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Activities in the field of publishing (editorial board,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.publishing_field_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row">
+                <div class="col-lg-8">
                     {% trans 'Participation in juries and/or scientific committees' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.scientific_jury_service }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Training activities' %}</h4>
+        <div class="card border-0 border-bottom">
+            <div class="card-heading">
+                <h4 class="my-2 fs-5">{% trans 'Training activities' %}</h4>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Scientific, pedagogical or other training you have attended...(LLL, SMCS, RHUM, Summer School)' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.formations|default_if_none:"n/a" }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Summary' %}</h4>
+        <div class="card border-0 border-bottom">
+            <div class="card-heading">
+                <h4 class="my-2 fs-5">{% trans 'Summary' %}</h4>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-5">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-5">
                     {% trans 'Percentage for teaching' %}
                 </div>
-                <div class="col-md-7">
+                <div class="col-lg-7">
                     {{ mandate.tutoring_percent }} %
                 </div>
             </div>
             {% if mandate.assistant_type == assistant_type.ASSISTANT %}
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-5">
+                <div class="row">
+                    <div class="col-lg-5">
                         {% trans 'Percentage for research and Ph.D.' %}
                     </div>
-                    <div class="col-md-7">
+                    <div class="col-lg-7">
                         {{ mandate.research_percent }} %
                     </div>
                 </div>
             {% endif %}
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-5">
+            <div class="row">
+                <div class="col-lg-5">
                     {% trans 'Percentage for service activities' %}
                 </div>
-                <div class="col-md-7">
+                <div class="col-lg-7">
                     {{ mandate.service_activities_percent }} %
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-5">
+            <div class="row">
+                <div class="col-lg-5">
                     {% trans 'Percentage of involvement as beneficiary in training activities' %}
                 </div>
-                <div class="col-md-7">
+                <div class="col-lg-7">
                     {{ mandate.formation_activities_percent }} %
                   </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'General comment' %}</h4>
+        <div class="card border-0 border-bottom">
+            <div class="card-heading">
+                <h4 class="my-2 fs-5">{% trans 'General comment' %}</h4>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+        <div class="form-group pt-2">
+            <div class="row">
+                <div class="col-lg-3">
                     {% trans 'Remark concerning the activity report' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.activities_report_remark|default_if_none:"n/a" }}
                 </div>
             </div>
diff --git a/templates/manager_home.html b/templates/manager_home.html
index 9984efe0f..6d5aa0564 100644
--- a/templates/manager_home.html
+++ b/templates/manager_home.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -29,80 +29,80 @@
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'institution' %}" id="lnk_institution">{% trans 'Institution' %}</a></li>
-<li><a href="{% url 'mandates' %}" id="lnk_mandates">{% trans 'Mandates' %}</a></li>
-<li class="active">{% trans 'Assistants' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'institution' %}" id="lnk_institution">{% trans 'Institution' %}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'mandates' %}" id="lnk_mandates">{% trans 'Mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Assistants' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
-        <div class="row" style="padding-top: 10px;">
-            <div class="col-md-1"><i class="fas fa-tachometer-alt" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+<div class="card">
+    <div class="card-body">
+        <div class="row pt-2">
+            <div class="col-lg-1"><i class="fas fa-tachometer-alt" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'mandates_list' %}" id="lnk_dashboard">{% trans 'Dashboard' %}</a></h4>
                 <p>{% trans 'Table listing all the files' %}</p>
             </div>
-            <div class="col-md-1"><i class="fa fa-users" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+            <div class="col-lg-1"><i class="fa fa-users" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'reviewers_list' %}" id="lnk_reviewers">
                     {% trans 'Reviewers' %}</a></h4>
                 <p>{% trans 'Adding, replacing and deleting reviewers' %}</p>
             </div>
         </div>
-        <div class="row" style="padding-top: 10px;">
-            <div class="col-md-1"><i class="fa fa-download" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+        <div class="row pt-2">
+            <div class="col-lg-1"><i class="fa fa-download" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'load_mandates' %}" id="lnk_load_mandates">
                     {% trans 'Import assistant mandates' %}</a></h4>
                 <p>{% trans 'Importing files from an XLSX file' %}</p>
             </div>
-            <div class="col-md-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+            <div class="col-lg-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'export_mandates' %}" id="lnk_upload_mandates" class="no_spinner">
                     {% trans 'Export of assistants mandates' %}</a></h4>
                 <p>{% trans 'Exporting files to an XLSX file' %}</p>
             </div>
         </div>
-        <div class="row" style="padding-top: 10px;">
-            <div class="col-md-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+        <div class="row pt-2">
+            <div class="col-lg-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'export_mandates_pdf' %}" id="lnk_export_mandates" class="no_spinner">
                     {% trans 'Export of assistants mandates' %}</a></h4>
                 <p>{% trans 'Exporting all data to a PDF file' %}</p>
             </div>
-            <div class="col-md-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+            <div class="col-lg-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'export_declined_mandates_pdf' %}" id="lnk_export_declined_mandates" class="no_spinner">
                     {% trans 'Export of the declined assistants mandates' %}</a></h4>
                 <p>{% trans 'Exporting data for which mandate has been declined' %}</p>
             </div>
         </div>
-        <div class="row" style="padding-top: 10px;">
-            <div class="col-md-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+        <div class="row pt-2">
+            <div class="col-lg-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'export_mandates_to_sap' %}" id="lnk_export_mandates_to_sap" class="no_spinner">
                     {% trans 'Export mandates to sap' %}</a></h4>
                 <p>{% trans 'This export is used to add assistants form to SAP' %}</p>
             </div>
 
-            <div class="col-md-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+            <div class="col-lg-1"><i class="fa fa-upload" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'export_list_declined_mandates_pdf' %}" id="lnk_export_declined_mandates" class="no_spinner">
                     {% trans 'Export list of declined mandate assistants ' %}</a></h4>
                 <p>{% trans 'Exporting assistants who declined their renewal' %}</p>
             </div>
         </div>
-        <div class="row" style="padding-top: 10px;">
-            <div class="col-md-1"><i class="far fa-envelope" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+        <div class="row pt-2">
+            <div class="col-lg-1"><i class="far fa-envelope" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'messages_history' %}" id="lnk_emails">{% trans 'Emails' %}</a></h4>
                 <p>{% trans 'Mail service management to assistants and Deans of Faculty' %}</p>
             </div>
-            <div class="col-md-1"><i class="fas fa-cogs" style="font-size: 400%; color: #6699FF;"></i></div>
-            <div class="col-md-5">
+            <div class="col-lg-1"><i class="fas fa-cogs" style="font-size: 400%; color: #6699FF;"></i></div>
+            <div class="col-lg-5">
                 <h4 class="media-heading"><a href="{% url 'settings_edit' %}" id="lnk_settings">{% trans 'Settings' %}</a></h4>
                 <p>{% trans 'Management of application access dates' %}</p>
             </div>
diff --git a/templates/manager_replace_reviewer.html b/templates/manager_replace_reviewer.html
index 39730a795..a241a7d91 100644
--- a/templates/manager_replace_reviewer.html
+++ b/templates/manager_replace_reviewer.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n display_role %}
 
@@ -27,20 +27,20 @@
 {% endcomment %}
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-<link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 <link rel="stylesheet" href="{% static 'css/jquery-ui.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li><a href="{% url 'reviewers_list' %}" id="lnk_reviewers_list">{% trans 'Reviewers' %}</a></li>
-<li class="active">{% trans 'Replacement' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'reviewers_list' %}" id="lnk_reviewers_list">{% trans 'Reviewers' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Replacement' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
         <form method="POST" action="{% url 'reviewer_replace' %}">
 
  		    {% csrf_token %}
@@ -71,9 +71,9 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
 		<input type="hidden" name="reviewer_id" id="reviewer.id" value="{{ reviewer.id }}">
 		<button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_add_reviewer_save"
 				onclick="return confirm('{% trans 'Confirm reviewer replacement' %}')">
-			<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+			<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
 			<a class="btn btn-default" id="lnk_upload_cancel" href="{% url 'reviewers_list' %}">
-				<span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel'%}</a>
+				<i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel'%}</a>
     	</form>
     </div>
 </div>
diff --git a/templates/manager_reviews_view.html b/templates/manager_reviews_view.html
index 9ef030b16..730498d99 100644
--- a/templates/manager_reviews_view.html
+++ b/templates/manager_reviews_view.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n display_role %}
 
@@ -30,43 +30,43 @@
 {% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-    <li><a href="{% url 'mandates_list' %}" id="lnk_assistants">{% trans 'List of mandates' %}</a></li>
-    <li class="active">{% trans 'Assistant file' %}</li>
+    <li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+    <li class="breadcrumb-item"><a href="{% url 'mandates_list' %}" id="lnk_assistants">{% trans 'List of mandates' %}</a></li>
+    <li class="breadcrumb-item active">{% trans 'Assistant file' %}</li>
 {% endblock %}
 
 {% block content %}
-    <div class="page-header">
+    <div class="page-header mb-0 border-bottom-0 pb-0">
         <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year }} </h3>
         <ul class="nav nav-tabs">
-            <li>
+            <li class="nav-item">
                 <form id=mandate_id method="POST" action="{% url 'mandate_read' %}">
                     {{ form.non_field_errors }}
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                    <button type="submit" class="btn btn-link" title="{% trans 'Administrative data'%}">
+                    <button type="submit" class="btn btn-link nav-link" title="{% trans 'Administrative data'%}">
                         {% trans 'Administrative data'%}
                     </button>
                 </form>
             </li>
-            <li><a href="{% url 'manager_assistant_form_view' mandate_id=mandate_id %}">{% trans 'Assistant file' %}</a></li>
-            <li class="active"><a href="#">{% trans 'Workflow and reviews' %}</a></li>
+            <li class="nav-item"><a href="{% url 'manager_assistant_form_view' mandate_id=mandate_id %}" class="nav-link">{% trans 'Assistant file' %}</a></li>
+            <li class="nav-item"><a href="#" class="nav-link active">{% trans 'Workflow and reviews' %}</a></li>
         </ul>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-body">
+    <div class="card border-top-0">
+        <div class="card-body">
             <div class="row">
-                <div class="col-md-8">
+                <div class="col-lg-8">
 
                     <dl class="row">
                         {% for review in reviews %}
-                            <dt class="col-sm-2">{% trans 'Reviewer' %}</dt>
-                            <dd class="col-sm-10">
-                                <p>
+                            <dt class="col-md-2">{% trans 'Reviewer' %}</dt>
+                            <dd class="col-md-10">
+                                <p class="mb-0">
                                 {% if review.status == 'DONE' %}
-                                    <span class="far fa-check-square" style="font-size: 14pt" aria-hidden="true"></span>
+                                    <i class="far fa-check-square fs-4" aria-hidden="true"></i>
                                 {% else %}
-                                    <span class="fas fa-pencil-alt" style="font-size: 14pt" aria-hidden="true"></span>
+                                    <i class="fas fa-pencil-alt fs-4" aria-hidden="true"></i>
                                 {% endif %}
                                 {% if review.reviewer is None %}
                                     {{ review.mandate.assistant.supervisor }} - {% trans 'Promoter' %}
@@ -76,48 +76,48 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year }} </
                                 {% endif %}
                                 </p>
                             </dd>
-                            <dt class="col-sm-2">
+                            <dt class="col-md-2">
                                 {% trans 'Opinion' %}
                             </dt>
-                            <dd class="col-sm-10">
-                                <p>
+                            <dd class="col-md-10">
+                                <p class="mb-0">
                                 {% if review.advice == "FAVORABLE" %}
-                                    <span class="far fa-thumbs-up"
-                                          style="font-size: 14pt; color: green" aria-hidden="true"></span>
+                                    <i class="far fa-thumbs-up fs-4 text-success"
+                                          aria-hidden="true"></i>
                                 {% elif review.advice == "UNFAVOURABLE" %}
-                                    <span class="far fa-thumbs-down" style="font-size: 14pt; color: red" aria-hidden="true"></span>
+                                    <i class="far fa-thumbs-down text-danger fs-4" aria-hidden="true"></i>
                                 {% else %}
-                                    <span class="fas fa-exclamation-triangle" style="font-size: 14pt; color: orange" aria-hidden="true"></span>
+                                    <i class="fas fa-exclamation-triangle text-warning fs-4" aria-hidden="true"></i>
                                 {% endif %}
                                 {{ review.get_advice_display }}
                                 </p>
                             </dd>
                             {% if review.justification %}
-                                <dt class="col-sm-2">
+                                <dt class="col-md-2">
                                     {% trans 'Justification' %}
                                 </dt>
-                                <dd class="col-sm-10">
-                                    <p>
+                                <dd class="col-md-10">
+                                    <p class="mb-0">
                                         {{ review.justification }}
                                     </p>
                                 </dd>
                             {% endif %}
                             {% if review.remark %}
-                                <dt class="col-sm-2">
+                                <dt class="col-md-2">
                                     {% trans 'Remark' %}
                                 </dt>
-                                <dd class="col-sm-10">
-                                    <p>
+                                <dd class="col-md-10">
+                                    <p class="mb-0">
                                         {{ review.remark }}
                                     </p>
                                 </dd>
                             {% endif %}
                             {% if review.confidential %}
-                                <dt class="col-sm-2">
+                                <dt class="col-md-2">
                                     {% trans 'Confidential' %}
                                 </dt>
-                                <dd class="col-sm-10">
-                                    <p>
+                                <dd class="col-md-10">
+                                    <p class="mb-0">
                                         {{ review.confidential }}
                                     </p>
                                 </dd>
@@ -141,12 +141,12 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year }} </
 
                 </div>
 
-                <div class="col-md-4">
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
+                <div class="col-lg-4">
+                    <div class="card">
+                        <div class="card-heading">
                             {% trans 'History reviews' %}
                         </div>
-                        <div class="panel-body"><div class="history-viewer" data-url="{% url 'review_history' history_uuid %}"></div>
+                        <div class="card-body"><div class="history-viewer" data-url="{% url 'review_history' history_uuid %}"></div>
                         </div>
                     </div>
 
@@ -159,8 +159,8 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year }} </
 {% endblock %}
 
 {% block script %}
-    <script src="{% static "js/vue.min.js" %}"></script>
-    <script src="{% static "js/vue-i18n.min.js" %}"></script>
+    <script src="{% static 'js/vue.min.js' %}"></script>
+    <script src="{% static 'js/vue-i18n.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'osis_history/osis-history.umd.min.js' %}"></script>
     <script>
         function confirm_click() {
diff --git a/templates/mandate_form.html b/templates/mandate_form.html
index 5bc102550..fedaf65e5 100644
--- a/templates/mandate_form.html
+++ b/templates/mandate_form.html
@@ -1,7 +1,6 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
-{
 
 {% comment "License" %}
 * OSIS stands for Open Student Information System. It's an application
@@ -34,35 +33,35 @@
  </style>
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li><a href="{% url 'mandates_list' %}" id="lnk_assistants">{% trans 'List of mandates' %}</a></li>
-<li class="active">{% trans 'Mandate edition' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'mandates_list' %}" id="lnk_assistants">{% trans 'List of mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Mandate edition' %}</li>
 
 {% endblock %}
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ mandate.academic_year.year|add:1 }}</h3>
     <ul class="nav nav-tabs">
-	    <li class="active"><a href="#">{% trans 'Administrative data' %}</a></li>
-        <li><a href="{% url 'manager_assistant_form_view' mandate_id=mandate.id %}">{% trans 'Assistant file' %}</a></li>
-        <li><a href="{% url 'manager_reviews_view' mandate_id=mandate.id %}">{% trans 'Workflow and reviews' %}</a></li>
+	    <li class="nav-item"><a href="#" class="nav-link active">{% trans 'Administrative data' %}</a></li>
+        <li class="nav-item"><a href="{% url 'manager_assistant_form_view' mandate_id=mandate.id %}" class="nav-link">{% trans 'Assistant file' %}</a></li>
+        <li class="nav-item"><a href="{% url 'manager_reviews_view' mandate_id=mandate.id %}" class="nav-link">{% trans 'Workflow and reviews' %}</a></li>
     </ul>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card border-top-0">
+    <div class="card-body">
         <form method="post" action=" {% url 'assistant_mandate_change_state' %} ">
             {% csrf_token %}
             <div class="row">
-                <div class="col-sm-6" style="vertical-align: middle;">
+                <div class="col-md-6 align-middle">
                     <h3>{{ mandate.assistant }} ({{ mandate.assistant.person.gender }})</h3>
                 </div>
 
-                <div class="col-sm-6" style="text-align: right;vertical-align: bottom;">
+                <div class="col-md-6 text-end align-bottom">
                     {% if mandate.state == "TO_DO" %}
                         <input type="hidden" id="hdn_change_state_mandate_id" name="mandate_id" value="{{ mandate.id }}">
                         <button type="submit" class="btn btn-danger" title="{% trans 'Refuse'%}" id="bt_mandate_decline"
                                 name="bt_mandate_decline" onclick="return confirm('{% trans 'Are you sure you want to decline the renewal request? This action is irreversible.' %}')">
-                            <span class="fas fa-times-circle" aria-hidden="true"></span> {% trans 'Refuse'%}
+                            <i class="fas fa-times-circle" aria-hidden="true"></i> {% trans 'Refuse'%}
                         </button>
                     {% else %}
                         {% trans 'State' %} : {% trans mandate.get_state_display %}
@@ -75,15 +74,15 @@ <h3>{{ mandate.assistant }} ({{ mandate.assistant.person.gender }})</h3>
             {{ mandate.assistant.person.email }}
             <div class="form-group">
                 <div class="row">
-                    <div class="col-md-4">
+                    <div class="col-lg-4">
                         <label for="txt_assistant_type">{% trans 'Assistant type' %}</label>
                         {{ form.assistant_type }}<span class="error">{{ form.assistant_type.errors }}</span>
                     </div>
-                    <div class="col-md-4">
+                    <div class="col-lg-4">
                         <label for="txt_matricule_number">{% trans 'Registration number' %}</label>
                         {{ form.sap_id }}
                     </div>
-                    <div class="col-md-4">
+                    <div class="col-lg-4">
                         <label for="txt_renewal_type">{% trans 'Renewal type' %}</label>
 
                             {{ form.renewal_type }}<span class="error">{{ form.renewal_type.errors }}</span>
@@ -93,15 +92,15 @@ <h3>{{ mandate.assistant }} ({{ mandate.assistant.person.gender }})</h3>
             <div class="form-group">
                 <div class="row">
 
-                    <div class="col-md-4">
+                    <div class="col-lg-4">
                         <label for="txt_contract_duration">{% trans 'Contract length' %}</label>
                         {{ form.contract_duration }}
                     </div>
-                    <div class="col-md-4">
+                    <div class="col-lg-4">
                         <label for="txt_contract_duration_fte">{% trans 'Full-time equivalent' %}</label>
                         {{ form.contract_duration_fte }}
                     </div>
-                    <div class="col-md-4">
+                    <div class="col-lg-4">
                         <label for="txt_fulltime_equivalent">{% trans 'Percentage of occupancy' %}</label>
                         {{ form.fulltime_equivalent }}
                     </div>
@@ -134,7 +133,7 @@ <h3>{{ mandate.assistant }} ({{ mandate.assistant.person.gender }})</h3>
                 {% for form in formset %}
                     {% for field in form %}
                         {% if field.name == "DELETE" %}
-                            <div class="controls">{{ field }} {% trans 'Delete' %}<span class="error">{{ field.errors }}</span></div>
+                            <div class="controls mt-2 mb-3">{{ field }} {% trans 'Delete' %}<span class="error">{{ field.errors }}</span></div>
                         {% else %}
                             <div class="controls">{{ field }}<span class="error">{{ field.errors }}</span></div>
                         {% endif %}
@@ -154,36 +153,36 @@ <h3>{{ mandate.assistant }} ({{ mandate.assistant.person.gender }})</h3>
                  {{ form.other_status }}<span class="error">{{ form.other_status.errors }}</span>
             </div>
             <br>
-            <div class="panel-default">
-                <div class="panel-heading">
+            <div class="card">
+                <div class="card-heading">
                     <h4>{% trans 'Report of the steering committee (mandatory from the second renewal application)' %}</h4>
                 </div>
             </div>
 
             {% for file in files %}
-                <div class="row" style="padding-top: 15px;">
-                    <div class="col-md-4" id="pnl_filename" style="text-align: left">
+                <div class="row pt-3">
+                    <div class="col-lg-4 text-start" id="pnl_filename">
                         <a href="{% url 'assistant_file_download' document_file_id=file.id %}"
                            class="no_spinner">{{ file.document_file }}</a>
                     </div>
-                    <div class="col-md-4" style="text-align: left">
-                        <a class="btn btn-default btn-danger btn-sm " style="margin-right: 5px;"
+                    <div class="col-lg-4 text-start">
+                        <a class="btn btn-danger btn-md me-2"
                            title="{% trans 'Delete file' %}"
                            onclick="if (formIsChanged()){location.href='{% url 'delete_pdf_file' file.id 'mandate_read' mandate.id %}';}">
-                            <span class="fas fa-times" aria-hidden="true" id="lnk_delete_file"></span>
+                            <i class="fas fa-times" aria-hidden="true" id="lnk_delete_file"></i>
                             {% trans 'Delete' %}</a>
                     </div>
                 </div>
             {% endfor %}
-            <div class="form-group" style="padding-top: 15px;">
+            <div class="form-group pt-3">
                 {{ document_form }}
             </div>
             <br>
             <input type="hidden" id="hdn_mandate_id" name="mandate_id" value="{{ mandate.id }}">
-            <button type="submit" class="btn btn-primary" title="{% trans 'Save' %}" id="bt_mandate_save"><span
-                    class="far fa-save" aria-hidden="true"></span> {% trans 'Save' %}</button>
+            <button type="submit" class="btn btn-primary" title="{% trans 'Save' %}" id="bt_mandate_save"><i
+                    class="far fa-save" aria-hidden="true"></i> {% trans 'Save' %}</button>
             <a class="btn btn-default" id="lnk_mandate_cancel" href="{% url 'mandates_list' %}">
-                <span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel' %}</a>
+                <i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel' %}</a>
         </form>
     </div>
 </div>
diff --git a/templates/mandate_learning_unit_list.html b/templates/mandate_learning_unit_list.html
index 7b0b599ad..caaa624b2 100644
--- a/templates/mandate_learning_unit_list.html
+++ b/templates/mandate_learning_unit_list.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,28 +27,28 @@
 {% endcomment %}
 {% block style %}
     <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-    <link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+    <link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-    <li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
-    <li class="active">{% trans 'Renewal application form' %}</li>
+    <li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
+    <li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
 {% endblock %}
 {% block content %}
     <ul class="nav nav-tabs ">
-        <li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-        <li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
-        <li class="active"><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
+        <li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+        <li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
+        <li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link active">{% trans 'Learning units' %}</a></li>
         {% if assistant_type == "ASSISTANT" %}
-            <li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-            <li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
+            <li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
+            <li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
         {% endif %}
-        <li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-        <li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
+        <li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
+        <li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
     </ul>
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="panel-default">
-                <div class="panel-heading">
+    <div class="card">
+        <div class="card-body">
+            <div class="card-default">
+                <div class="card-heading">
                     <h4>{% trans 'Learning units' %}</h4>
                     <h5>{% trans 'Exercises, workshops, seminars - associated with hours of volume 2, which you personally assume' %}</h5>
                 </div>
@@ -82,7 +82,7 @@ <h5>{% trans 'Exercises, workshops, seminars - associated with hours of volume 2
                                    onclick="return confirm('{% trans 'Are you sure you want to delete this course?' %}')">
                                 <button type="button" class="btn btn-link btn-lg" title="{% trans 'Delete' %}"
                                         id="bt_learning_unit_delete">
-                                    <span class="fas fa-times" aria-hidden="true"></span>
+                                    <i class="fas fa-times" aria-hidden="true"></i>
                                 </button>
                                 {% trans 'Delete' %}</a></td>
                             </tr>
@@ -92,11 +92,11 @@ <h5>{% trans 'Exercises, workshops, seminars - associated with hours of volume 2
             </div>
             <a href="{% url 'tutoring_learning_unit_add' %}">
                 <button type="button" class="btn btn-link btn-lg" title="{% trans 'Add' %}" id="bt_reviewer_add">
-                    <span class="fas fa-plus" aria-hidden="true"></span>
+                    <i class="fas fa-plus" aria-hidden="true"></i>
                 </button>
                 {% trans 'Add a teaching unit' %}</a>
-            <div class="panel-default">
-                <div class="panel-heading">
+            <div class="card">
+                <div class="card-heading">
                     <h4>{% trans 'Evaluations (optional)' %}</h4>
                 </div>
             </div>
@@ -105,23 +105,23 @@ <h4>{% trans 'Evaluations (optional)' %}</h4>
                 {% csrf_token %}
                 {{ form.non_field_errors }}
                 {% for file in files %}
-                    <div class="row" style="padding-top: 15px;">
-                        <div class="col-md-2" style="text-align: left">
-                            <a class="btn btn-default btn-danger btn-sm" id="btn_delete_file" style="margin-right: 5px;"
+                    <div class="row pt-3">
+                        <div class="col-lg-2 text-start me-1">
+                            <a class="btn btn-danger btn-sm" id="btn_delete_file"
                                title="{% trans 'Delete' %}"
                                onclick="location.href='{% url 'assistant_file_delete' file.id 'mandate_learning_units' %}';">
-                                <span class="fas fa-times" aria-hidden="true" id="spn_delete_file"></span>
+                                <i class="fas fa-times" aria-hidden="true" id="spn_delete_file"></i>
                                 {% trans 'Delete' %}</a>
                         </div>
-                        <div class="col-md-10" id="hdn_filename" style="text-align: left">
+                        <div class="col-lg-10" id="hdn_filename" style="text-align: left">
                             <a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">{{ file.document_file }}</a>
                         </div>
                     </div>
                 {% endfor %}
-                <div class="form-group" style="padding-top: 15px;">
-                    <a class="btn btn-default" data-toggle="modal" data-target="#pnl_upload_documents"
-                       id="btn_add_file" style="margin-right: 5px;" title="{% trans 'Add file' %}">
-                        <span class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></span>
+                <div class="form-group pt-3">
+                    <a class="btn btn-default me-1" data-bs-toggle="modal" data-bs-target="#pnl_upload_documents"
+                       id="btn_add_file" title="{% trans 'Add file' %}">
+                        <i class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></i>
                         {% trans 'Attach a PDF file' %}</a>
                 </div>
                 <input type="hidden" value="{{ mandate_id | default_if_none:'' }}" id="hdn_current_mandate_id"
@@ -134,9 +134,9 @@ <h4>{% trans 'Evaluations (optional)' %}</h4>
     {% include "new_document.html" %}
 {% endblock %}
 {% block script %}
-    <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script>
-    <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script>
-    <script>
+<script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script>
+<script>
         $(document).ready(function () {
             $('#myTable').DataTable({
                 stateSave: true
diff --git a/templates/mandate_reviews_view.html b/templates/mandate_reviews_view.html
index 427ea5790..e40c03b94 100644
--- a/templates/mandate_reviews_view.html
+++ b/templates/mandate_reviews_view.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -29,15 +29,15 @@
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
-<li class="active">{% trans 'Reviews' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Reviews' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h2>{% trans 'Assistant mandate renewal application' %}</h2>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
     {% for review in reviews %}
         {% if review.reviewer %}
             <h4>{{ review.changed }} - {% trans review.reviewer.role %} : {{ review.reviewer.person }}</h4>
@@ -47,25 +47,24 @@ <h4>{{ review.changed }} - {% trans 'Thesis promoter' %} : {{ review.mandate.ass
         <div class="list-group">
             <div class="list-group-item">
                 <h4 class="list-group-item-text">{% trans 'Opinion' %}</h4>
-                <p style="margin-top: 10px;">
+                <p class="mt-2">
                     {% if review.advice == "FAVORABLE" %}
-                    <span class="far fa-thumbs-up" style="font-size: 14pt; color: green"
-                          aria-hidden="true"></span>
+                    <i class="far fa-thumbs-up fs-4 text-success" aria-hidden="true"></i>
                     {% elif review.advice == "UNFAVOURABLE" %}
-                    <span class="far fa-thumbs-down" style="font-size: 14pt; color: red" aria-hidden="true"></span>
+                    <i class="far fa-thumbs-down fs-4 text-danger" aria-hidden="true"></i>
                     {% else %}
-                    <span class="fas fa-exclamation-triangle" style="font-size: 14pt; color: orange" aria-hidden="true"></span>
+                    <i class="fas fa-exclamation-triangle fs-4 text-warning" aria-hidden="true"></i>
                     {% endif %}
                     {% trans review.advice %}
                 </p>
                 {% if review.advice != "FAVORABLE" %}
                     <h4 class="list-group-item-text">{% trans 'Justification' %}</h4>
-                    <p style="margin-top: 10px;">
+                    <p class="mt-2">
                         {{ review.justification }}
                     </p>
                 {% endif %}
                 <h4 class="list-group-item-text">{% trans 'Remark' %}</h4>
-                    <p style="margin-top: 10px;">
+                    <p class="mt-2">
                         {{ review.remark }}
                     </p>
             </div>
diff --git a/templates/mandates_list.html b/templates/mandates_list.html
index 204ffe1c2..6ba8af1fa 100644
--- a/templates/mandates_list.html
+++ b/templates/mandates_list.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -26,22 +26,22 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li class="active">{% trans 'List of mandates' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'List of mandates' %}</li>
 {% endblock %}
 
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
-        <div class="row" style="padding-bottom: 5px;">
-            <div class="col-md-12 text-right">
+<div class="card">
+    <div class="card-body">
+        <div class="row pb-2">
+            <div class="col-lg-12 text-end">
                 <form action=" {% url 'mandates_list' %} " method="GET">
                 {{ form.academic_year }}
-                <button type="submit" class="btn btn-default btn-xs" title="{% trans 'Apply'%}" id="bt_filter">
-                <span class="fas fa-check" aria-hidden="true"></span> {% trans 'Apply'%}</button>
+                <button type="submit" class="btn btn-default btn-sm" title="{% trans 'Apply'%}" id="bt_filter">
+                <i class="fas fa-check" aria-hidden="true"></i> {% trans 'Apply'%}</button>
                 </form>
             </div>
         </div>
@@ -71,7 +71,7 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
                             <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
                             <a href="mailto:{{ mandate.assistant.person.email }}">{{ mandate.assistant }}</a>
                             <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
-                                <span class="far fa-edit" aria-hidden="true"></span> {% trans 'Edit'%}
+                                <i class="far fa-edit" aria-hidden="true"></i> {% trans 'Edit'%}
                             </button></form>
                         </td>
                         <td>
@@ -146,5 +146,5 @@ <h6>
         stateSave: true
     } );
 } );
-</script>   
+</script>
 {% endblock %}
diff --git a/templates/messages.html b/templates/messages.html
index 3b8122ecc..81603388e 100644
--- a/templates/messages.html
+++ b/templates/messages.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -26,16 +26,16 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li class="active">{% trans 'Messages' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Messages' %}</li>
 {% endblock %}
 
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
         <div class="list-group">
             <div class="list-group-item">
                 <h4 class="list-group-item-heading">{% trans 'Assistants' %}</h4>
@@ -43,21 +43,24 @@ <h4 class="list-group-item-heading">{% trans 'Assistants' %}</h4>
                     {% trans 'Startup procedure' %} <br>
                     <small>{% trans 'The assistant in special renewal procedure will receive a different email' %}.</small>
                 </p>
-                <p style="margin-top: 10px;"><a href="{% url 'send_message_to_assistants' %}" class="btn btn-info"
-                                                role="button"
-                                                onclick="return confirm('{% trans 'Are you sure you want to send these emails? This action is irreversible.' %}')">
+                <p class="mt-2">
+                    <a href="{% url 'send_message_to_assistants' %}" class="btn btn-info"
+                    role="button"
+                    onclick="return confirm('{% trans 'Are you sure you want to send these emails? This action is irreversible.' %}')">
                     {% trans 'Send an email to all assistants' %}</a></p>
             </div>
             <div class="list-group-item">
                 <h4 class="list-group-item-heading">{% trans 'Reviewers' %}</h4>
                 <p class="list-group-item-text">{% trans 'Startup procedure' %}</p>
-                <p style="margin-top: 10px;"><a href="{% url 'send_message_to_reviewers' %}" class="btn btn-info"
-                                                role="button"
-                                                onclick="return confirm('{% trans 'Are you sure you want to send these emails? This action is irreversible.' %}')">
+                <p class="mt-2">
+                    <a href="{% url 'send_message_to_reviewers' %}"
+                        class="btn btn-info"
+                        role="button"
+                        onclick="return confirm('{% trans 'Are you sure you want to send these emails? This action is irreversible.' %}')">
                     {% trans 'Send an email to reviewers' %}</a></p>
             </div>
         </div>
-        <div class="table-responsive">
+        <div class="table-responsive mt-3">
             <table id="myTable" class="table table-hover table-condensed table-bordered" cellspacing="0" width="100%">
                 <thead>
                     <tr>
diff --git a/templates/new_document.html b/templates/new_document.html
index 3967b4a89..adcc5a706 100644
--- a/templates/new_document.html
+++ b/templates/new_document.html
@@ -33,13 +33,10 @@
                 <form method="post" enctype="multipart/form-data" >
                     {% csrf_token %}
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"
-                                id="bt_close_upload_file_modal"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title" id="upload_assistant_file">
-                            <label id="lbl_description_label"></label>
-                        </h4>
+                        <h4 class="modal-title" id="upload_assistant_file"><label id="lbl_description_label"></label></h4>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" id="bt_close_upload_file_modal"></button>
                         <div class="row" style="padding-top: 4px;">
-                            <div class="col-md-4" style="text-align: left">
+                            <div class="col-lg-4 text-start">
                                 <span class="error" id="error_modal_upload">{{ pnl_modal_upload }}</span>
                             </div>
                         </div>
@@ -50,9 +47,9 @@ <h4 class="modal-title" id="upload_assistant_file">
                         <br>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal"
+                        <button type="button" class="btn btn-default" data-bs-dismiss="modal"
                                 id="bt_cancel_upload_file_modal">{% trans 'Cancel' %}</button>
-                        <input type="submit" class="btn btn-primary" value="{% trans 'Save'%}" data-dismiss="modal"
+                        <input type="submit" class="btn btn-primary" value="{% trans 'Save'%}" data-bs-dismiss="modal"
                                id="bt_upload_document"/>
                         <input type="hidden" name="description" value="" id="hdn_description"/>
                         <input type="hidden" id="hdn_filename" />
diff --git a/templates/phd_supervisor_assistants_list.html b/templates/phd_supervisor_assistants_list.html
index 5c342d8b3..d3f6dda00 100644
--- a/templates/phd_supervisor_assistants_list.html
+++ b/templates/phd_supervisor_assistants_list.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,13 +27,13 @@
 {% endcomment %}
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-<link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li class="active">{% trans 'List of files (as a thesis promoter)' %}</li>
+<li class="breadcrumb-item active">{% trans 'List of files (as a thesis promoter)' %}</li>
 {% endblock %}
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     {% if current_reviewer %}
         <h6>{% trans 'You are connected as' %} {{ current_reviewer.person }} ({% trans current_reviewer.role %}) -
             {{ current_reviewer.entity.most_recent_acronym }}</h6>
@@ -41,17 +41,17 @@ <h6>{% trans 'You are connected as' %} {{ current_reviewer.person }} ({% trans c
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
     {% if current_reviewer %}
         <ul class="nav nav-tabs">
-            <li><a href="{% url 'reviewer_mandates_list' %}">{% trans 'List of files' %}</a></li>
-            <li><a href="{% url 'reviewer_mandates_list_todo' %}">{% trans 'Files that can be treated' %}</a></li>
-            <li class="active"><a href="#">{% trans 'List of files (as a thesis promoter)' %}</a></li>
+            <li class="nav-item"><a href="{% url 'reviewer_mandates_list' %}" class="nav-link">{% trans 'List of files' %}</a></li>
+            <li class="nav-item"><a href="{% url 'reviewer_mandates_list_todo' %}" class="nav-link">{% trans 'Files that can be treated' %}</a></li>
+            <li class="nav-item"><a href="#" class="nav-link active">{% trans 'List of files (as a thesis promoter)' %}</a></li>
             {% if can_delegate %}
-                <li><a href="{% url 'reviewer_delegation' %}">{% trans 'Delegation(s)' %}</a></li>
+                <li class="nav-item"><a href="{% url 'reviewer_delegation' %}" class="nav-link">{% trans 'Delegation(s)' %}</a></li>
             {% endif %}
         </ul>
     {% endif %}
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card {% if current_reviewer %}border-top-0 {% endif %}">
+    <div class="card-body">
         <div class="table-responsive">
         <table id="myTable" class="table table-hover table-condensed table-bordered" cellspacing="0" width="100%">
         <thead>
@@ -85,29 +85,29 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
             <td>{{ mandate.contract_duration_fte }}</td>
             <td>{{ mandate.get_state_display }}</td>
             {% if mandate.assistant.supervisor == request.user.person and mandate.state == "PHD_SUPERVISOR" %}
-                <td align="center">
+                <td class="text-center">
                     <form method="POST" action="{% url 'phd_supervisor_review_edit' %}">
                         {% csrf_token %}
                         <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
                         <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
-                            <span class="far fa-edit" aria-hidden="true"></span>
+                            <i class="far fa-edit" aria-hidden="true"></i>
                             {% trans 'Edit'%}
                         </button>
                     </form>
                 </td>
             {% elif mandate.state != "TRTS" and mandate.state != "TO_DO" and mandate.state != "DECLINED" %}
-                <td align="center">
+                <td class="text-center">
                     <form method="POST" action="{% url 'phd_supervisor_review_view' %}">
                         {% csrf_token %}
                         <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
                         <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
-                            <span class="far fa-eye" aria-hidden="true"></span>
+                            <i class="far fa-eye" aria-hidden="true"></i>
                             {% trans 'View'%}
                         </button>
                     </form>
                 </td>
             {% else %}
-                <td align="center"><span class="fas fa-ban" aria-hidden="true"></span></td>
+                <td class="text-center"><i class="fas fa-ban" aria-hidden="true"></i></td>
             {% endif %}
             </tr>
         {% endfor %}
@@ -118,8 +118,8 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
 </div>
 {% endblock %}
 {% block script %}
-<script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script>
 <script>
 $(document).ready(function() {
     $('#myTable').DataTable( {
diff --git a/templates/pst_form_view.html b/templates/pst_form_view.html
index 31ff19f0c..08d0e7739 100644
--- a/templates/pst_form_view.html
+++ b/templates/pst_form_view.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,42 +27,42 @@
 {% endcomment %}
 {% block breadcrumb %}
     {% if role != "PHD_SUPERVISOR" %}
-        <li><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">
+        <li class="breadcrumb-item"><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">
             {% trans 'List of files' %}</a></li>
     {% else %}
-        <li><a href="{% url 'phd_supervisor_assistants_list' %}" id="lnk_phd_supervisor_assistants_list">
+        <li class="breadcrumb-item"><a href="{% url 'phd_supervisor_assistants_list' %}" id="lnk_phd_supervisor_assistants_list">
             {% trans 'List of files (as a thesis promoter)' %}</a></li>
     {% endif %}
-        <li class="active">{% trans 'Assistant file' %}</li>
+        <li class="breadcrumb-item active">{% trans 'Assistant file' %}</li>
 {% endblock %}
 
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     {% if current_reviewer %}
         <h6>{% trans 'You are connected as' %} {{ current_reviewer.person }} ({% trans current_reviewer.role %}) - {{ entity.acronym }}</h6>
     {% else %}
         <h6>{% trans 'You are connected as' %} {{ current_person }} ({% trans role %})</h6>
     {% endif %}
     <h3>{% trans 'Assistant mandate renewal application processing' %} ({{ year }})</h3>
-    <h4>{{ assistant.person }}</h4>
+    <h4 class="fs-5 my-2">{{ assistant.person }}</h4>
     <ul class="nav nav-tabs">
 	    {% if menu_type == 'phd_supervisor_menu' %}
-            <li class="active"><a href="#">
+            <li class="nav-item"><a href="#" class="nav-link active">
                 <form method="POST" action="{% url 'phd_supervisor_pst_form_view' %}">
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                    <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                    <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                         {% trans 'Assistant file' %}
                     </button>
                 </form>
                 </a>
             </li>
         {% else %}
-	        <li class="active"><a href="#">
+	        <li class="nav-item"><a href="#" class="nav-link active">
                 <form method="POST" action="{% url 'pst_form_view' %}">
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                    <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                    <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                         {% trans 'Assistant file' %}
                     </button>
                 </form>
@@ -70,31 +70,31 @@ <h4>{{ assistant.person }}</h4>
             </li>
         {% endif %}
         {% for dict in menu %}
-            <li class={{ dict.class}}><a href="#">
+            <li class="nav-item {{ dict.class}}"><a href="#" class="nav-link">
                 {% if menu_type == 'phd_supervisor_menu' %}
                     {% if dict.action == 'edit' %}
                         <form method="POST" action="{% url 'phd_supervisor_review_edit' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'Edit'%}">
                     {% elif dict.action == 'view' %}
                         <form method="POST" action="{% url 'phd_supervisor_review_view' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                     {% endif %}
                 {% else %}
                     {% if dict.action == 'edit' %}
                         <form method="POST" action="{% url 'review_edit' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'Edit'%}">
                     {% elif dict.action == 'view' %}
                         <form method="POST" action="{% url 'review_view' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
                             <input type="hidden" name="role" value="{{ dict.item }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                     {% endif %}
                 {% endif %}
                 {% if dict.item == 'PHD_SUPERVISOR' %}
@@ -111,129 +111,129 @@ <h4>{{ assistant.person }}</h4>
         {% endfor %}
     </ul>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
-  		<div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Contract' %}</h4>
+<div class="card border-top-0">
+    <div class="card-body">
+  		<div class="card-default">
+  			<div class="card-heading border-bottom">
+  				<h4 class="fs-5 my-2">{% trans 'Contract' %}</h4>
   			</div>
   		</div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Assistant type' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {% trans mandate.get_assistant_type_display %}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Registration number' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.sap_id }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Date of first nomination' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.entry_date}}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Renewal type' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {% trans mandate.get_renewal_type_display %}
                 </div>
             </div>
 
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Contract length' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.contract_duration }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Full-time equivalent' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.contract_duration_fte }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Percentage of occupancy' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.fulltime_equivalent }}
                 </div>
             </div>
 
             {% if mandate.renewal_type == assistant_mandate_renewal.EXCEPTIONAL %}
-                <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+                <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Justification' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.justification}}
                 </div>
             </div>
             {% endif %}
 
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Promoter' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.assistant.supervisor|default:'n/a' }}
                 </div>
             </div>
 
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Entities' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {% for this_entity in entities %}
                         <div class="row">
-                            <div class="col-md-1">
+                            <div class="col-lg-1">
                                 {% trans this_entity.get_entity_type_display %}
                             </div>
-                            <div class="col-md-11">{{this_entity.acronym}}</div>
+                            <div class="col-lg-11">{{this_entity.acronym}}</div>
                         </div>
                     {% endfor %}
                 </div>
             </div>
 
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Comment' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.comment|default_if_none:''}}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Absences' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.absences|default_if_none:''}}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Other status' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{mandate.other_status|default_if_none:''}}
                 </div>
             </div>
@@ -241,85 +241,85 @@ <h4>{% trans 'Contract' %}</h4>
         </div>
 
   		{% if mandate.assistant_type == 'ASSISTANT' %}
-            <div class="panel-default">
-  			    <div class="panel-heading">
-  				    <h4>{% trans 'Ph.D.' %}</h4>
+            <div class="card border-0">
+  			    <div class="card-heading border-bottom">
+  				    <h4 class="fs-5 my-2">{% trans 'Ph.D.' %}</h4>
     		    </div>
     	    </div>
-            <div class="form-group" style="padding-top: 10px;">
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+            <div class="form-group pt-2">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Enrolled in the Ph.D. program' %}
                     </div>
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {% if assistant.inscription %}
                             {{ assistant.get_inscription_display }}
                         {% endif %}
                     </div>
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {% trans 'Scheduled date of registration' %}
                     </div>
-                    <div class="col-md-3">
+                    <div class="col-lg-3">
                         {{ assistant.expected_phd_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Date of doctoral enrollment' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.phd_inscription_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Programmed date of confirmation test' %}<h6>{% trans '(starting the 2nd renewal)' %}</h6>
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.confirmation_test_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Date of succeeded confirmation test' %}<h6>{% trans '(starting the 2nd renewal)' %}</h6>
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.succeed_confirmation_test_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Date of defense of thesis (if already known)' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.thesis_date|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Title (provisional) of the thesis' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.thesis_title|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Remark' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ assistant.remark|default_if_none:"n/a" }}
                     </div>
                 </div>
             </div>
             {% if phd_files.all %}
-                <div class="row" style="padding-top: 10px;">
-                    <div class="col-md-12">
+                <div class="row pt-2">
+                    <div class="col-lg-12">
                     {% trans 'Report of the steering committee (mandatory from the second renewal application)' %}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <ul>
+                <div class="row pt-1">
+                    <ul class="ps-5">
                         {% for file in phd_files %}
                             <li>
                                 <a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">
@@ -329,69 +329,69 @@ <h4>{% trans 'Ph.D.' %}</h4>
                     </ul>
                 </div>
             {% endif %}
-            <div class="panel-default">
-  			        <div class="panel-heading">
-  				        <h4>{% trans 'Research' %}</h4>
+            <div class="card border-0">
+  			        <div class="card-heading border-bottom">
+  				        <h4 class="fs-5 my-2">{% trans 'Research' %}</h4>
     		        </div>
             </div>
-            <div class="form-group" style="padding-top: 10px;">
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+            <div class="form-group pt-2">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Scientific stay(s) and/or course(s)' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.internships|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Conference(s) to which I have contributed by communication or post, alone or with others.' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.conferences|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Publication(s) in preparation' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.publications|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Prize(s) and/or distinction(s)' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.awards|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Participation in thesis and/or dissertation' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.framing|default_if_none:"n/a" }}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-3">
+                <div class="row pt-1">
+                    <div class="col-lg-3">
                         {% trans 'Remark' %}
                     </div>
-                    <div class="col-md-9">
+                    <div class="col-lg-9">
                         {{ mandate.remark|default_if_none:"n/a" }}
                     </div>
                 </div>
             </div>
             {% if research_files.all %}
-                <div class="row" style="padding-top: 10px;">
-                    <div class="col-md-12">
+                <div class="row pt-2">
+                    <div class="col-lg-12">
                         {% trans 'List of publications in PDF format (DIAL)' %}
                     </div>
                 </div>
-                <div class="row" style="padding-top: 2px;">
-                    <ul>
+                <div class="row pt-1">
+                    <ul class="ps-5">
                         {% for file in research_files %}
                         <li>
                             <a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">
@@ -402,35 +402,35 @@ <h4>{% trans 'Research' %}</h4>
                 </div>
             {% endif %}
         {% endif %}
-        <div class="panel-default">
-  			<div class="panel-heading">
-  				<h4>{% trans 'Miscellaneous' %}</h4>
+        <div class="card border-0">
+  			<div class="card-heading border-bottom">
+  				<h4 class="fs-5 my-2">{% trans 'Miscellaneous' %}</h4>
     		</div>
     	</div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-4">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-4">
                     {% trans 'Current positions outside the University and % of time spent' %}
                 </div>
-                <div class="col-md-8">
+                <div class="col-lg-8">
                     {{ mandate.external_functions|default_if_none:"n/a" }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-4">
+            <div class="row pt-1">
+                <div class="col-lg-4">
                     {% trans 'Mandate requested externally (FNRS, FRIA, ...)' %}
                 </div>
-                <div class="col-md-8">
+                <div class="col-lg-8">
                     {{ mandate.external_contract|default_if_none:"n/a" }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Course units' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Course units' %}</h4>
             </div>
         </div>
-        <div class="table-responsive" style="padding-top: 10px;">
+        <div class="table-responsive pt-2">
             <table id="myTable" class="table table-striped table-condensed table-bordered" cellspacing="0" width="100%">
             <thead>
                 <tr>
@@ -465,12 +465,12 @@ <h4>{% trans 'Course units' %}</h4>
             </table>
         </div>
         {% if tutoring_files.all %}
-            <div class="row" style="padding-top: 10px;">
-                <div class="col-md-12">
+            <div class="row pt-2">
+                <div class="col-lg-12">
                     {% trans 'Evaluations (optional)' %}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
+            <div class="row pt-1">
                 <ul>
                     {% for file in tutoring_files %}
                         <li>
@@ -481,169 +481,169 @@ <h4>{% trans 'Course units' %}</h4>
                 </ul>
             </div>
         {% endif %}
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Representation activities at UCL' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Representation activities at UCL' %}</h4>
                 <h6>({% trans 'number of hours per year' %})</h6>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Within the faculty (program committees, faculty board, faculty council)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.faculty_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Within the institute (institute board, institute council,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.institute_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Within the sector (board and/or council)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.sector_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Within the organs of the University (academic council, other councils or commissions,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.governing_body_representation }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Within the CORSCI' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.corsci_representation }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Service activities' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Service activities' %}</h4>
                 <h6> ({% trans 'number of hours per year' %})</h6>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Information for future students (CIO, shows, Campus Days, Midi Masters,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.students_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Management of collective facilities (lab, workshop, library, IT department, website,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.infrastructure_mgmt_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans "Organization of seminars, conferences, visits, study tours, grounds, seminars... (not taken in account in the 'Teaching units' section)" %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.events_organisation_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Activities in the field of publishing (editorial board,...)' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.publishing_field_service }}
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-8">
+            <div class="row pt-1">
+                <div class="col-lg-8">
                     {% trans 'Participation in juries and/or scientific committees' %}
                 </div>
-                <div class="col-md-4">
+                <div class="col-lg-4">
                     {{ mandate.scientific_jury_service }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Training activities' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Training activities' %}</h4>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Scientific, pedagogical or other training you have attended...(LLL, SMCS, RHUM, Summer School)' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.formations|default_if_none:"n/a" }}
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'Summary' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'Summary' %}</h4>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-5">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-5">
                     {% trans 'Percentage for teaching' %}
                 </div>
-                <div class="col-md-7">
+                <div class="col-lg-7">
                     {{ mandate.tutoring_percent }} %
                 </div>
             </div>
             {% if mandate.assistant_type == 'ASSISTANT' %}
-                <div class="row" style="padding-top: 2px;">
-                    <div class="col-md-5">
+                <div class="row pt-1">
+                    <div class="col-lg-5">
                         {% trans 'Percentage for research and Ph.D.' %}
                     </div>
-                    <div class="col-md-7">
+                    <div class="col-lg-7">
                         {{ mandate.research_percent }} %
                     </div>
                 </div>
             {% endif %}
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-5">
+            <div class="row pt-1">
+                <div class="col-lg-5">
                     {% trans 'Percentage for service activities' %}
                 </div>
-                <div class="col-md-7">
+                <div class="col-lg-7">
                     {{ mandate.service_activities_percent }} %
                 </div>
             </div>
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-5">
+            <div class="row pt-1">
+                <div class="col-lg-5">
                     {% trans 'Percentage of involvement as beneficiary in training activities' %}
                 </div>
-                <div class="col-md-7">
+                <div class="col-lg-7">
                     {{ mandate.formation_activities_percent }} %
                 </div>
             </div>
         </div>
-        <div class="panel-default">
-            <div class="panel-heading">
-                <h4>{% trans 'General comment' %}</h4>
+        <div class="card border-0">
+            <div class="card-heading border-bottom">
+                <h4 class="fs-5 my-2">{% trans 'General comment' %}</h4>
             </div>
         </div>
-        <div class="form-group" style="padding-top: 10px;">
-            <div class="row" style="padding-top: 2px;">
-                <div class="col-md-3">
+        <div class="form-group pt-2">
+            <div class="row pt-1">
+                <div class="col-lg-3">
                     {% trans 'Remark concerning the activity report' %}
                 </div>
-                <div class="col-md-9">
+                <div class="col-lg-9">
                     {{ mandate.activities_report_remark|default_if_none:"n/a" }}
                 </div>
             </div>
diff --git a/templates/review_form.html b/templates/review_form.html
index 8432c706c..a61dc2f7c 100644
--- a/templates/review_form.html
+++ b/templates/review_form.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -31,13 +31,13 @@
 
 {% block breadcrumb %}
 {% if role != "PHD_SUPERVISOR" %}
-    <li><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">
+    <li class="breadcrumb-item"><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">
         {% trans 'List of files' %}</a></li>
 {% else %}
-    <li><a href="{% url 'phd_supervisor_assistants_list' %}" id="lnk_phd_supervisor_assistants_list">
+    <li class="breadcrumb-item"><a href="{% url 'phd_supervisor_assistants_list' %}" id="lnk_phd_supervisor_assistants_list">
         {% trans 'List of files (as a thesis promoter)' %}</a></li>
 {% endif %}
-<li class="active">{% trans 'Submit an opinion' %}</li>
+<li class="breadcrumb-item active">{% trans 'Submit an opinion' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
@@ -50,7 +50,7 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} ({{ year }})<
     <h4>{{ assistant.person }}</h4>
     <ul class="nav nav-tabs">
 	    {% if menu_type == 'phd_supervisor_menu' %}
-            <li><a href="#">
+            <li class="nav-item"><a href="#" class="nav-link">
                 <form method="POST" action="{% url 'phd_supervisor_pst_form_view' %}">
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
@@ -61,7 +61,7 @@ <h4>{{ assistant.person }}</h4>
                 </a>
             </li>
         {% else %}
-	        <li><a href="#">
+	        <li class="nav-item"><a href="#" class="nav-link">
                 <form method="POST" action="{% url 'pst_form_view' %}">
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
@@ -73,7 +73,7 @@ <h4>{{ assistant.person }}</h4>
             </li>
         {% endif %}
         {% for dict in menu %}
-            <li class={{ dict.class}}><a href="#">
+            <li class="nav-item"><a href="#" class="nav-link {{ dict.class}}">
                 {% if menu_type == 'phd_supervisor_menu' %}
                     {% if dict.action == 'edit' %}
                         <form method="POST" action="{% url 'phd_supervisor_review_edit' %}">
@@ -115,8 +115,8 @@ <h4>{{ assistant.person }}</h4>
     </ul>
 </div>
 
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card border-top-0">
+    <div class="card-body">
         {% if menu_type == 'phd_supervisor_menu' %}
             <form method="post" action="{% url 'phd_supervisor_review_save' %}">
         {% else %}
@@ -181,20 +181,20 @@ <h4>{{ assistant.person }}</h4>
             </div>
         {% endif %}
         <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_mandate_save"
-                name="save"><span class="far fa-save" aria-hidden="true">
-        </span> {% trans 'Save'%}</button>
+                name="save"><i class="far fa-save" aria-hidden="true">
+                </i> {% trans 'Save'%}</button>
         {% if menu_type == 'phd_supervisor_menu' %}
             <a class="btn btn-default" id="lnk_mandate_cancel"
                href="{% url 'phd_supervisor_assistants_list' %}">
         {% else %}
             <a class="btn btn-default" id="lnk_mandate_cancel" href="{% url 'reviewer_mandates_list' %}">
         {% endif %}
-        <span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel'%}</a>
+        <i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel'%}</a>
         {% if can_validate %}
             <button type="submit" class="btn btn-success" title="{% trans 'Validate and submit'%}"
                     id="bt_pstform_validate_and_submit" name="validate_and_submit"
                     onclick="return confirm('{% trans 'Are you sure you want to validate and submit? This action is irreversible.' %}')">
-            <span class="far fa-saved" aria-hidden="true"></span>{% trans 'Validate and submit'%}</button>
+            <i class="far fa-saved" aria-hidden="true"></i>{% trans 'Validate and submit'%}</button>
         {% endif %}
         <input type="hidden" name="mandate_id" value="{{mandate_id | default_if_none:''}}">
         <input type="hidden" name="review_id" value="{{review.id | default_if_none:''}}">
diff --git a/templates/review_view.html b/templates/review_view.html
index 747b87400..e4d594c6a 100644
--- a/templates/review_view.html
+++ b/templates/review_view.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -30,16 +30,16 @@
 {% endblock %}
 {% block breadcrumb %}
 {% if role != "PHD_SUPERVISOR" %}
-    <li><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">
+    <li class="breadcrumb-item"><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">
         {% trans 'List of files' %}</a></li>
 {% else %}
-    <li><a href="{% url 'phd_supervisor_assistants_list' %}" id="lnk_phd_supervisor_assistants_list">
+    <li class="breadcrumb-item"><a href="{% url 'phd_supervisor_assistants_list' %}" id="lnk_phd_supervisor_assistants_list">
         {% trans 'List of files (as a thesis promoter)' %}</a></li>
 {% endif %}
-<li class="active">{% trans 'Assistant file and opinion' %}</li>
+<li class="breadcrumb-item active">{% trans 'Assistant file and opinion' %}</li>
 {% endblock %}
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     {% if current_reviewer %}
         <h6>{% trans 'You are connected as' %} {{ current_reviewer.person }} ({% trans current_reviewer.role %}) - {{ entity.acronym }}</h6>
     {% else %}
@@ -49,22 +49,22 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} ({{ year }})<
     <h4>{{ assistant.person }}</h4>
     <ul class="nav nav-tabs">
 	    {% if menu_type == 'phd_supervisor_menu' %}
-            <li><a href="#">
+            <li class="nav-item"><a href="#" class="nav-link">
                 <form method="POST" action="{% url 'phd_supervisor_pst_form_view' %}">
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                    <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                    <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                         {% trans 'Assistant file' %}
                     </button>
                 </form>
                 </a>
             </li>
         {% else %}
-	        <li><a href="#">
+	        <li class="nav-item"><a href="#" class="nav-link">
                 <form method="POST" action="{% url 'pst_form_view' %}">
                     {% csrf_token %}
                     <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                    <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                    <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                         {% trans 'Assistant file' %}
                     </button>
                 </form>
@@ -72,31 +72,31 @@ <h4>{{ assistant.person }}</h4>
             </li>
         {% endif %}
         {% for dict in menu %}
-            <li class={{ dict.class}}><a href="#">
+            <li class="nav-item"><a href="#" class="nav-link {{ dict.class}}">
                 {% if menu_type == 'phd_supervisor_menu' %}
                     {% if dict.action == 'edit' %}
                         <form method="POST" action="{% url 'phd_supervisor_review_edit' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'Edit'%}">
                     {% elif dict.action == 'view' %}
                         <form method="POST" action="{% url 'phd_supervisor_review_view' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                     {% endif %}
                 {% else %}
                     {% if dict.action == 'edit' %}
                         <form method="POST" action="{% url 'review_edit' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'Edit'%}">
                     {% elif dict.action == 'view' %}
                         <form method="POST" action="{% url 'review_view' %}">
                             {% csrf_token %}
                             <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
                             <input type="hidden" name="role" value="{{ dict.item }}">
-                            <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
+                            <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'View'%}">
                     {% endif %}
                 {% endif %}
                 {% if dict.item == 'PHD_SUPERVISOR' %}
@@ -113,8 +113,8 @@ <h4>{{ assistant.person }}</h4>
         {% endfor %}
     </ul>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card border-top-0">
+    <div class="card-body">
         <h4>
             {% if review.reviewer is None %}
                 {{ review.mandate.assistant.supervisor }}
@@ -128,11 +128,11 @@ <h4>
             </label>
             <div class="controls">
                 {% if review.advice == "FAVORABLE" %}
-                    <span class="far fa-thumbs-up" style="font-size: 14pt; color: green" aria-hidden="true"></span>
+                    <i class="far fa-thumbs-up fs-4 text-success" aria-hidden="true"></i>
                 {% elif review.advice == "UNFAVOURABLE" %}
-                    <span class="far fa-thumbs-down" style="font-size: 14pt; color: red" aria-hidden="true"></span>
+                    <i class="far fa-thumbs-down fs-4 text-danger" aria-hidden="true"></i>
                 {% else %}
-                    <span class="fas fa-exclamation-triangle" style="font-size: 14pt; color: orange" aria-hidden="true"></span>
+                    <i class="fas fa-exclamation-triangle fs-4 text-warning" aria-hidden="true"></i>
                 {% endif %}
                 {% trans review.advice %}
             </div>
diff --git a/templates/reviewer_add_reviewer.html b/templates/reviewer_add_reviewer.html
index e9b6f7813..65b3cdc09 100644
--- a/templates/reviewer_add_reviewer.html
+++ b/templates/reviewer_add_reviewer.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,21 +27,21 @@
 {% endcomment %}
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-<link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 <link rel="stylesheet" href="{% static 'css/jquery-ui.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">{% trans 'List of files' %}</a></li>
-<li><a href="{% url 'reviewer_delegation' %}" id="lnk_reviewer_delegation">{% trans 'Delegation(s)' %}</a></li>
-<li class="active">{% trans 'Add a delegate' %}</li>
+<li  class="breadcrumb-item"><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_mandates_list">{% trans 'List of files' %}</a></li>
+<li  class="breadcrumb-item"><a href="{% url 'reviewer_delegation' %}" id="lnk_reviewer_delegation">{% trans 'Delegation(s)' %}</a></li>
+<li  class="breadcrumb-item active">{% trans 'Add a delegate' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h6>{% trans 'You are connected as' %} {{ reviewer.person }} ({% trans reviewer.role %}) - {{ entity.acronym }}</h6>
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
     <h5>{% trans 'Choose a person as reviewer for' %} {{ entity.most_recent_acronym }}</h5>
     <form method="POST" action="{% url 'reviewer_delegation_add' %}">
     {{ form.non_field_errors }}
@@ -58,9 +58,9 @@ <h5>{% trans 'Choose a person as reviewer for' %} {{ entity.most_recent_acronym
 	</div>
     <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_add_reviewer_save"
     onclick="return confirm('{% trans 'Are you sure you want to delegate your role? This action is irreversible.' %}')">
-    <span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+    <i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
     <a class="btn btn-default" id="lnk_upload_cancel" href="{% url 'reviewer_delegation' %}">
-    <span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel'%}</a>
+    <i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel'%}</a>
     </form>
     </div>
 </div>
diff --git a/templates/reviewer_mandates_list.html b/templates/reviewer_mandates_list.html
index 35600fad2..a169bc740 100644
--- a/templates/reviewer_mandates_list.html
+++ b/templates/reviewer_mandates_list.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,46 +27,46 @@
 {% endcomment %}
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-<link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li class="active">{% trans 'List of files' %}</li>
+<li class="breadcrumb-item active">{% trans 'List of files' %}</li>
 {% endblock %}
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     <h6>{% trans 'You are connected as' %} {{ reviewer.person }} ({{ reviewer.get_role_display }}) - {{ entity.acronym }}</h6>
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 
     <ul class="nav nav-tabs">
             {% if filter %}
-                <li><a href="{% url 'reviewer_mandates_list' %}">{% trans 'List of files' %}</a></li>
-                <li class="active"><a href="#">{% trans 'Files that can be treated' %}</a></li>
+                <li class="nav-item"><a href="{% url 'reviewer_mandates_list' %}" class="nav-link">{% trans 'List of files' %}</a></li>
+                <li class="nav-item"><a href="#" class="nav-link active">{% trans 'Files that can be treated' %}</a></li>
             {% else %}
-                <li class="active"><a href="#">{% trans 'List of files' %}</a></li>
-                <li><a href="{% url 'reviewer_mandates_list_todo' %}">{% trans 'Files that can be treated' %}</a></li>
+                <li class="nav-item"><a href="#" class="nav-link active">{% trans 'List of files' %}</a></li>
+                <li class="nav-item"><a href="{% url 'reviewer_mandates_list_todo' %}" class="nav-link">{% trans 'Files that can be treated' %}</a></li>
             {% endif %}
             {% if is_supervisor %}
-                <li><a href="{% url 'phd_supervisor_assistants_list' %}">{% trans 'List of files (as a thesis promoter)' %}</a></li>
+                <li class="nav-item"><a href="{% url 'phd_supervisor_assistants_list' %}" class="nav-link">{% trans 'List of files (as a thesis promoter)' %}</a></li>
             {% endif %}
             {% if can_delegate %}
-                <li><a href="{% url 'reviewer_delegation' %}">{% trans 'Delegation(s)' %}</a></li>
+                <li class="nav-item"><a href="{% url 'reviewer_delegation' %}" class="nav-link">{% trans 'Delegation(s)' %}</a></li>
             {% endif %}
         </ul>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card border-top-0">
+    <div class="card-body">
         {% if filter is False %}
-            <div class="row" style="padding-bottom: 5px;">
-                <div class="col-md-6 text-left">
+            <div class="row pb-2">
+                <div class="col-lg-6 text-left">
                     <a href="{% url 'export_mandates_for_entity_pdf' year %}" class="btn btn-default no_spinner">
                         {% trans 'Exporting all data to a PDF file'%}
                     </a>
                 </div>
-	            <div class="col-md-6 text-right">
+	            <div class="col-lg-6 text-right">
                     <form action=" {% url 'reviewer_mandates_list' %} " method="GET">
                     {{ form.academic_year }}
-                    <button type="submit" class="btn btn-default btn-xs" title="{% trans 'Apply'%}" id="bt_filter">
-                        <span class="fas fa-check" aria-hidden="true"></span> {% trans 'Apply'%}</button>
+                    <button type="submit" class="btn btn-default btn-sm" title="{% trans 'Apply'%}" id="bt_filter">
+                        <i class="fas fa-check" aria-hidden="true"></i> {% trans 'Apply'%}</button>
                     </form>
                 </div>
             </div>
@@ -134,35 +134,35 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
                         {% endif %}
                         </i>
                      {% elif review.status == review_status.IN_PROGRESS and  "VICE_RECTOR" in review.reviewer.role %}
-                        <i id="rev" class="fas fa-circle" style="font-size: 100%;  color: #79C84F;"></i>
+                        <i id="rev" class="fas fa-circle text-sucess" style="font-size: 100%;"></i>
                     {% endif %}
                 {% endfor %}
             </td>
 	        {% if mandate.edit %}
-                <td align="center">
+                <td class="text-center">
                     <form method="POST" action="{% url 'review_edit' %}">
                         {% csrf_token %}
                         <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
                         <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
-                            <span class="far fa-edit" aria-hidden="true"></span>
+                            <i class="far fa-edit" aria-hidden="true"></i>
                             {% trans 'Edit'%}
                         </button>
                     </form>
                 </td>
             {% elif mandate.view %}
-                <td align="center">
+                <td class="text-center">
                     <form method="POST" action="{% url 'pst_form_view' %}">
                         {% csrf_token %}
                         <input type="hidden" name="mandate_id" value="{{ mandate.id }}">
                         <input type="hidden" name="role" value="{{ reviewer.role }}">
                         <button type="submit" class="btn btn-link" title="{% trans 'View'%}">
-                            <span class="far fa-eye" aria-hidden="true"></span>
+                            <i class="far fa-eye" aria-hidden="true"></i>
                             {% trans 'View'%}
                         </button>
                     </form>
                 </td>
             {% else %}
-                <td align="center"><span class="fas fa-ban" aria-hidden="true"></span></td>
+                <td class="text-center"><i class="fas fa-ban" aria-hidden="true"></i></td>
             {% endif %}
             </tr>
         {% endfor %}
@@ -173,8 +173,8 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
 </div>
 {% endblock %}
 {% block script %}
-<script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script>
 <script>
 $(document).ready(function() {
     $('#myTable').DataTable( {
diff --git a/templates/reviewer_structures_list.html b/templates/reviewer_structures_list.html
index 6d3e2e1a9..c2f286b1d 100644
--- a/templates/reviewer_structures_list.html
+++ b/templates/reviewer_structures_list.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -30,25 +30,25 @@
 <link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_delegation">{% trans 'List of files' %}
+<li class="breadcrumb-item"><a href="{% url 'reviewer_mandates_list' %}" id="lnk_reviewer_delegation">{% trans 'List of files' %}
 </a></li>
-<li class="active">{% trans 'Delegation(s)' %}</li>
+<li class="breadcrumb-item active">{% trans 'Delegation(s)' %}</li>
 {% endblock %}
 {% block content %}
-<div class="page-header">
+<div class="page-header mb-0 border-bottom-0 pb-0">
     <h6>{% trans 'You are connected as' %} {{ current_reviewer.person }} ({% trans current_reviewer.role %}) - {{ entity.acronym }}</h6>
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
     <ul class="nav nav-tabs">
-        <li><a href="{% url 'reviewer_mandates_list' %}">{% trans 'List of files' %}</a></li>
-        <li><a href="{% url 'reviewer_mandates_list_todo' %}">{% trans 'Files that can be treated' %}</a></li>
+        <li class="nav-item"><a href="{% url 'reviewer_mandates_list' %}" class="nav-link">{% trans 'List of files' %}</a></li>
+        <li class="nav-item"><a href="{% url 'reviewer_mandates_list_todo' %}" class="nav-link">{% trans 'Files that can be treated' %}</a></li>
         {% if is_supervisor %}
-            <li><a href="{% url 'phd_supervisor_assistants_list' %}">{% trans 'List of files (as a thesis promoter)' %}</a></li>
+            <li class="nav-item"><a href="{% url 'phd_supervisor_assistants_list' %}" class="nav-link">{% trans 'List of files (as a thesis promoter)' %}</a></li>
         {% endif %}
-        <li class="active"><a href="#">{% trans 'Delegation(s)' %}</a></li>
+        <li class="nav-item"><a href="#" class="nav-link active">{% trans 'Delegation(s)' %}</a></li>
     </ul>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card border-top-0">
+    <div class="card-body">
         <div class="table-responsive">
             <table id="myTable" class="table table-hover table-condensed table-bordered" cellspacing="0" width="100%">
             <thead>
@@ -63,7 +63,7 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
                 <tr>
                 <td>{{ entity_version.title }}</td>
                 <td>{{ entity_version.acronym }}</td>
-                <td align="center">
+                <td class="text-center">
                 {% if entity_version.entity.delegated_reviewer %}
                     {{ entity_version.entity.delegated_reviewer.0.person }}
                 {% else %}
@@ -71,8 +71,8 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
                     {{ form.non_field_errors }}
  		            {% csrf_token %}
                     <input type="hidden" name="entity" value="{{ entity_version.entity.id }}">
-                    <button type="submit" class="btn btn-link" title="{% trans 'Edit'%}">
-                        <span class="fas fa-plus" aria-hidden="true"></span> {% trans 'Add'%}
+                    <button type="submit" class="btn btn-link text-decoration-none" title="{% trans 'Edit'%}">
+                        <i class="fas fa-plus" aria-hidden="true"></i> {% trans 'Add'%}
                     </button></form>
                 {% endif %}
                 </td>
diff --git a/templates/reviewers_list.html b/templates/reviewers_list.html
index 8cca4752a..49e88e83b 100644
--- a/templates/reviewers_list.html
+++ b/templates/reviewers_list.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n display_role %}
 
@@ -28,15 +28,15 @@
 {% block style %}
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li class="active">{% trans 'Reviewers' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Reviewers' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
         <form action="{% url 'reviewer_action' %}" method="post">
             {% csrf_token %}
             {{ reviewers_formset.management_form }}
diff --git a/templates/settings.html b/templates/settings.html
index 6be37e5c3..d1bb27ce1 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -27,18 +27,18 @@
 {% endcomment %}
 {% block style %}
 <link rel="stylesheet" href="{% static 'css/custom.css' %}">
-<link rel="stylesheet" href="{% static 'css/dataTables.bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'css/bootstrap5/dataTables.bootstrap5.min.css' %}">
 {% endblock %}
 {% block breadcrumb %}
-<li><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
-<li class="active">{% trans 'Settings' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'manager_home' %}" id="lnk_manager_home">{% trans 'Assistants' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Settings' %}</li>
 {% endblock %}
 {% block content %}
 <div class="page-header">
     <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1 }}</h3>
 </div>
-<div class="panel panel-default">
-    <div class="panel-body">
+<div class="card">
+    <div class="card-body">
         <form method="POST" action="{% url 'settings_save' %}">
         {{ form.non_field_errors }}
  		    {% csrf_token %}
@@ -46,34 +46,34 @@ <h3>{% trans 'Assistant mandate renewal application processing' %} {{ year|add:1
 			    {{ hidden }}
 		    {% endfor %}
         <div class="row">
-            <div class="col-md-6">
-	            <div class="panel-default">
-		            <div class="panel-heading">
-                        <h4>{% trans 'Mandates renewal procedure dates' %}</h4>
+            <div class="col-lg-6">
+	            <div class="card border-0">
+		            <div class="card-heading border-bottom">
+                        <h4 class="fs-5 my-2">{% trans 'Mandates renewal procedure dates' %}</h4>
 		            </div>
-	                <div class="form-group" style="padding-top: 5px;">
+	                <div class="form-group pt-2">
                         <label for="txt_starting_date">{% trans 'Beginning' %}</label>
                         {{ form.starting_date }}
                         <span class="error">{{ form.starting_date.errors }}</span>
                     </div>
-                    <div class="form-group" style="padding-top: 5px;">
+                    <div class="form-group pt-2">
                         <label for="txt_ending_date">{% trans 'End' %}</label>
                         {{ form.ending_date }}
                         <span class="error">{{ form.ending_date.errors }}</span>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
-                <div class="panel-default">
-		            <div class="panel-heading">
-                        <h4>{% trans 'Assessment access dates for assistants' %}</h4>
+            <div class="col-lg-6">
+                <div class="card border-0">
+		            <div class="card-heading border-bottom">
+                        <h4 class="fs-5 my-2">{% trans 'Assessment access dates for assistants' %}</h4>
 		            </div>
-                    <div class="form-group" style="padding-top: 5px;">
+                    <div class="form-group pt-2">
                         <label for="txt_assistants_starting_date">{% trans 'Beginning' %}</label>
                         {{ form.assistants_starting_date }}
                         <span class="error">{{ form.assistants_starting_date.errors }}</span>
                     </div>
-                    <div class="form-group" style="padding-top: 5px;">
+                    <div class="form-group pt-2">
                         <label for="txt_assistants_ending_date">{% trans 'End' %}</label>
                         {{ form.assistants_ending_date }}
                         <span class="error">{{ form.assistants_ending_date.errors }}</span>
@@ -82,17 +82,17 @@ <h4>{% trans 'Assessment access dates for assistants' %}</h4>
             </div>
         </div>
         <div class="row">
-            <div class="col-md-12">
-                <div class="panel-default">
-		            <div class="panel-heading">
-                        <h4>{% trans 'Assistants contract ending dates' %}</h4>
+            <div class="col-lg-12">
+                <div class="card border-0">
+		            <div class="card-heading border-bottom">
+                        <h4 class="fs-5 my-2">{% trans 'Assistants contract ending dates' %}</h4>
 		            </div>
-                    <div class="form-group" style="padding-top: 5px;">
+                    <div class="form-group pt-2">
                         <label for="txt_assistants_starting_date">{% trans 'Beginning' %}</label>
                         {{ form.assistants_contract_end_starting_date }}
                         <span class="error">{{ form.assistants_contract_end_starting_date.errors }}</span>
                     </div>
-                    <div class="form-group" style="padding-top: 5px;">
+                    <div class="form-group pt-2">
                         <label for="txt_assistants_ending_date">{% trans 'End' %}</label>
                         {{ form.assistants_contract_end_ending_date }}
                         <span class="error">{{ form.assistants_contract_end_ending_date.errors }}</span>
@@ -101,9 +101,9 @@ <h4>{% trans 'Assistants contract ending dates' %}</h4>
             </div>
         </div>
         <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_settings_save">
-            <span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+            <i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
             <a class="btn btn-default" id="lnk_cancel" href="{% url 'manager_home' %}">
-            <span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel'%}</a>
+            <i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel'%}</a>
         </form>
     </div>
 </div>
diff --git a/templates/tutoring_learning_unit_year.html b/templates/tutoring_learning_unit_year.html
index 2a8ee2587..b9c455591 100644
--- a/templates/tutoring_learning_unit_year.html
+++ b/templates/tutoring_learning_unit_year.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "bootstrap5/layout.html" %}
 {% load static %}
 {% load i18n %}
 
@@ -26,36 +26,36 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 {% block breadcrumb %}
-<li><a href="{% url 'assistant_mandates' %}" id="lnk_assistant_mandates">{% trans 'My mandates' %}</a></li>
-<li class="active">{% trans 'Renewal application form' %}</li>
+<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_assistant_mandates">{% trans 'My mandates' %}</a></li>
+<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
 {% endblock %}
 {% block content %}
 <ul class="nav nav-tabs ">
-<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
-<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
-<li class="active"><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
-{% if assistant_type == "ASSISTANT" %}
-    <li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
-{% endif %}
-<li><a href="{% url 'form_part4_edit'%}">{% trans 'Research' %}</a></li>
-<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
-<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
+    <li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
+    <li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link active">{% trans 'Learning units' %}</a></li>
+    {% if assistant_type == "ASSISTANT" %}
+        <li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
+    {% endif %}
+    <li class="nav-item"><a href="{% url 'form_part4_edit'%}" class="nav-link">{% trans 'Research' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
+    <li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
 </ul>
-    <div class="panel panel-default">
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-body">
         <form method="POST" action="{% url 'tutoring_learning_unit_save' %}">
         {{ form.non_field_errors }}
         {% csrf_token %}
  		{% for hidden in form.hidden_fields %}
 			{{ hidden }}
 		{% endfor %}
-        <div class="panel-info">
-            <div class="panel-heading">
+        <div class="card-info bg-info">
+            <div class="card-heading">
                 <h4>{% trans 'Learning unit' %}</h4>
             </div>
         </div>
         <div class="form-group">
-            <label style="padding-top: 15px" for="txt_learning_unit" id="id_learning_unit">
+            <label class="pt-3" for="txt_learning_unit" id="id_learning_unit">
                 {% trans 'Learning unit' %}</label>
             {{ form.media }}
             {{ form.learning_unit_year }}
@@ -104,9 +104,9 @@ <h4>{% trans 'Learning unit' %}</h4>
             <span class="error">{{ form.others_delivery.errors }}</span>
         </div>
         <button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_save_tutoring_learning_unit">
-        <span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
+        <i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
         <a class="btn btn-default" id="lnk_cancel" href="{% url 'mandate_learning_units' %}">
-        <span class="fas fa-times" aria-hidden="true"></span> {% trans 'Cancel'%}</a>
+        <i class="fas fa-times" aria-hidden="true"></i> {% trans 'Cancel'%}</a>
         <input type="hidden" name="mandate_id" value="{{ mandate_id }}">
     </form>
     </div>