diff --git a/templates/accounts/add_student.html b/templates/accounts/add_student.html
index 450fb39..851a9ad 100644
--- a/templates/accounts/add_student.html
+++ b/templates/accounts/add_student.html
@@ -35,7 +35,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-md-6 mr-auto">
+        <div class="col-md-6 ms-auto">
             <div class="card">
                 <p class="form-title">{% trans 'Others' %}</p>
                 <div class="card-body">
diff --git a/templates/accounts/lecturer_list.html b/templates/accounts/lecturer_list.html
index 8f862c8..33fcee0 100644
--- a/templates/accounts/lecturer_list.html
+++ b/templates/accounts/lecturer_list.html
@@ -56,9 +56,9 @@
                             <i class="fa fa-ellipsis-vertical"></i>
                         </button>
                         <ul class="dropdown-menu position-fixed">
-                          <li><a class="dropdown-item" href="{% url 'staff_edit' pk=lecturer.pk %}"><i class="fas fa-edit"></i>{% trans 'Update' %}</a></li>
-                          <li><a class="dropdown-item"  target="_blank" href="{% url 'profile_single' lecturer.id %}?download_pdf=1"><i class="fas fa-download"></i>{% trans 'Download PDF' %}</a></li>
-                          <li><a class="dropdown-item text-danger" href="{% url 'lecturer_delete' pk=lecturer.pk %}"><i class="fas fa-trash-alt"></i> {% trans 'Delete' %}</a></li>
+                          <li><a class="dropdown-item" href="{% url 'staff_edit' pk=lecturer.pk %}"><i class="unstyled me-2 fas fa-edit"></i>{% trans 'Update' %}</a></li>
+                          <li><a class="dropdown-item"  target="_blank" href="{% url 'profile_single' lecturer.id %}?download_pdf=1"><i class="unstyled me-2 fas fa-download"></i>{% trans 'Download PDF' %}</a></li>
+                          <li><a class="dropdown-item text-danger" href="{% url 'lecturer_delete' pk=lecturer.pk %}"><i class="unstyled me-2 fas fa-trash-alt"></i> {% trans 'Delete' %}</a></li>
                         </ul>
                       </div>
                 </td>
diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html
index 8f95c36..7a8df87 100644
--- a/templates/accounts/profile.html
+++ b/templates/accounts/profile.html
@@ -72,7 +72,7 @@
                 <hr>
                 {% endif %}
     
-                <p class="fw-bold"><i class="fas fa-user"></i>{% trans 'Personal Info' %}</p>
+                <p class="fw-bold"><i class="me-2 fas fa-user"></i>{% trans 'Personal Info' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'First Name:' %}</strong> {{ user.first_name|title }}</p>
                     <p><strong>{% trans 'Last Name:' %}</strong> {{ user.last_name|title }}</p>
@@ -80,7 +80,7 @@
                 </div>
                 {% if user.is_student %}
                 <hr>
-                <p class="fw-bold"><i class="fas fa-graduation-cap"></i>{% trans 'Applicant Info' %}</p>
+                <p class="fw-bold"><i class="me-2 fas fa-graduation-cap"></i>{% trans 'Applicant Info' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'School:' %} </strong>{% trans 'Hawas Preparatory School' %}</p>
                     <p><strong>{% trans 'Level:' %} </strong>{{ level.level }}</p>
@@ -88,7 +88,7 @@
                 {% endif %}
     
                 <hr>
-                <p class="fw-bold"><i class="fas fa-phone-square-alt"></i>{% trans 'Contact Info' %}</p>
+                <p class="fw-bold"><i class="me-2 fas fa-phone-square-alt"></i>{% trans 'Contact Info' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'Email:' %}</strong> {{ user.email }}</p>
                     <p><strong>{% trans 'Tel No.:' %}</strong> {{ user.phone }}</p>
@@ -96,7 +96,7 @@
                 </div>
     
                 <hr>
-                <p class="fw-bold"><i class="fa fa-calendar-day"></i>{% trans 'Important Dates' %}</p>
+                <p class="fw-bold"><i class="me-2 fa fa-calendar-day"></i>{% trans 'Important Dates' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'Last login:' %}</strong> {{ user.last_login }}</p>
                     {% if current_semester and current_session %}
diff --git a/templates/accounts/profile_single.html b/templates/accounts/profile_single.html
index 2eadf99..c60762b 100644
--- a/templates/accounts/profile_single.html
+++ b/templates/accounts/profile_single.html
@@ -85,7 +85,7 @@
                 <hr>
                 {% endif %}
     
-                <p class="fw-bold"><i class="fas fa-user"></i> {% trans 'Personal Info' %}</p>
+                <p class="fw-bold"><i class="me-2 fas fa-user"></i> {% trans 'Personal Info' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'First Name' %}:</strong> {{ user.first_name|title }}</p>
                     <p><strong>{% trans 'Last Name' %}:</strong> {{ user.last_name|title }}</p>
@@ -93,7 +93,7 @@
                 </div>
                 {% if user.is_student %}
                 <hr>
-                <p class="fw-bold"><i class="fas fa-graduation-cap"></i> {% trans 'Applicant Info' %}</p>
+                <p class="fw-bold"><i class="me-2 fas fa-graduation-cap"></i> {% trans 'Applicant Info' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'School' %}: </strong>Unity College</p>
                     <p><strong>{% trans 'Level' %}: </strong>{{ level.level }}</p>
@@ -102,7 +102,7 @@
                 {% endif %}
     
                 <hr>
-                <p class="fw-bold"><i class="fas fa-phone-square-alt"></i>{% trans 'Contact Info' %}</p>
+                <p class="fw-bold"><i class="me-2 fas fa-phone-square-alt"></i>{% trans 'Contact Info' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'Email' %}:</strong> {{ user.email }}</p>
                     <p><strong>{% trans 'Tel No.' %}:</strong> {{ user.phone }}</p>
@@ -110,7 +110,7 @@
                 </div>
     
                 <hr>
-                <p class="fw-bold"><i class="fa fa-calendar-day"></i>{% trans 'Important Dates' %}</p>
+                <p class="fw-bold"><i class="me-2 fa fa-calendar-day"></i>{% trans 'Important Dates' %}</p>
                 <div class="dashboard-description">
                     <p><strong>{% trans 'Last login' %}:</strong> {{ user.last_login }}</p>
                     {% if current_semester and current_session %}
diff --git a/templates/accounts/student_list.html b/templates/accounts/student_list.html
index 72f04ef..a22dbc3 100644
--- a/templates/accounts/student_list.html
+++ b/templates/accounts/student_list.html
@@ -58,9 +58,9 @@
                             <i class="fa fa-ellipsis-vertical"></i>
                         </button>
                         <ul class="dropdown-menu position-fixed">
-                          <li><a class="dropdown-item" href="{% url 'student_edit' student.student.pk %}"><i class="fas fa-edit"></i>{% trans 'Update' %}</a></li>
-                          <li><a class="dropdown-item" target="_blank" href="{% url 'profile_single' student.student.id %}?download_pdf=1"><i class="fas fa-download"></i>{% trans 'Download PDF' %}</a></li>
-                          <li><a class="dropdown-item text-danger" href="{% url 'student_delete' student.pk %}"><i class="fas fa-trash-alt"></i>{% trans 'Delete' %}</a></li>
+                          <li><a class="dropdown-item" href="{% url 'student_edit' student.student.pk %}"><i class="unstyled me-2 fas fa-edit"></i>{% trans 'Update' %}</a></li>
+                          <li><a class="dropdown-item" target="_blank" href="{% url 'profile_single' student.student.id %}?download_pdf=1"><i class="unstyled me-2 fas fa-download"></i>{% trans 'Download PDF' %}</a></li>
+                          <li><a class="dropdown-item text-danger" href="{% url 'student_delete' student.pk %}"><i class="unstyled me-2 fas fa-trash-alt"></i>{% trans 'Delete' %}</a></li>
                         </ul>
                       </div>
                 </td>
diff --git a/templates/course/program_list.html b/templates/course/program_list.html
index bab76d3..7fef2a4 100644
--- a/templates/course/program_list.html
+++ b/templates/course/program_list.html
@@ -53,8 +53,8 @@
                                 <i class="fa fa-ellipsis-vertical"></i>
                             </button>
                             <ul class="dropdown-menu position-fixed">
-                              <li><a class="dropdown-item" href="{% url 'edit_program' pk=program.pk %}"><i class="fas fa-edit"></i>{% trans 'Update' %}</a></li>
-                              <li><a class="dropdown-item text-danger" href="{% url 'program_delete' pk=program.pk %}"><i class="fas fa-trash-alt"></i>{% trans 'Delete' %}</a></li>
+                              <li><a class="dropdown-item" href="{% url 'edit_program' pk=program.pk %}"><i class="unstyled me-2 fas fa-edit"></i>{% trans 'Update' %}</a></li>
+                              <li><a class="dropdown-item text-danger" href="{% url 'program_delete' pk=program.pk %}"><i class="unstyled me-2 fas fa-trash-alt"></i>{% trans 'Delete' %}</a></li>
                             </ul>
                         </div>
                     </td>
diff --git a/templates/course/program_single.html b/templates/course/program_single.html
index c04e9f8..953a373 100644
--- a/templates/course/program_single.html
+++ b/templates/course/program_single.html
@@ -79,10 +79,10 @@
                             </button>
                             <div class="dropdown-menu position-fixed">
                                 <a class="dropdown-item" href="{% url 'edit_course' slug=course.slug %}">
-                                    <i class="fas fa-pencil-alt"></i> {% trans 'Edit' %}
+                                    <i class="unstyled me-2 fas fa-pencil-alt"></i> {% trans 'Edit' %}
                                 </a>
                                 <a class="dropdown-item" href="{% url 'delete_course' slug=course.slug %}">
-                                    <i class="fas fa-trash-alt"></i> {% trans 'Delete' %}
+                                    <i class="unstyled me-2 fas fa-trash-alt"></i> {% trans 'Delete' %}
                                 </a>
                             </div>
                         </div>
diff --git a/templates/quiz/progress.html b/templates/quiz/progress.html
index 5b1971b..bf09508 100644
--- a/templates/quiz/progress.html
+++ b/templates/quiz/progress.html
@@ -95,7 +95,9 @@
 </div>
   {% endif %}
   {% if not cat_scores and not exams %}
- 	<div class="col-12 p-4 text-center"><h3><i class="far fa-frown text-secondary"></i></h3> {% trans 'No recordes yet' %}</div> 
+  <h4 class="text-center mt-5 py-5 text-muted">
+	  <i class="fa-regular fa-folder-open me-2"></i>{% trans 'Progress records will appear here' %}
+  </h4>
   {% endif %}
 
 {% endblock %}
diff --git a/templates/registration/register.html b/templates/registration/register.html
index 738ba6e..7446844 100644
--- a/templates/registration/register.html
+++ b/templates/registration/register.html
@@ -9,7 +9,7 @@
 	
   <div class="blue-gradient text-light p-3 mb-5">
 	  <h1 class="lead my-0">
-		<i class="fas fa-lock mr-2"></i>{% trans 'Create Your Account' %}
+		<i class="fas fa-lock ms-2"></i>{% trans 'Create Your Account' %}
 	  </h1>
   </div>