diff --git a/base/templates/base/audit_tag/employee_account_block_unblock.html b/base/templates/base/audit_tag/employee_account_block_unblock.html
index a69d35bad..b9b3bfa17 100644
--- a/base/templates/base/audit_tag/employee_account_block_unblock.html
+++ b/base/templates/base/audit_tag/employee_account_block_unblock.html
@@ -6,7 +6,7 @@
 <form action="{% url 'enable-account-block-unblock' %}" method="post">
     {% csrf_token %}
   <div class="oh-label__info" for="enable_block_unblock">
-    <label class="oh-label" for="enable_block_unblock">{% trans "Restric Login Account" %}</label> 
+    <label class="oh-label" for="enable_block_unblock">{% trans "Restrict Login Account" %}</label> 
     <span class="oh-info mr-2" title="{% trans "By enabling this feature, you can block or unblock an employee's account." %}">
     </span> 
   </div>
diff --git a/base/templates/base/department/department_view.html b/base/templates/base/department/department_view.html
index 51a35d8e2..982f8c55d 100644
--- a/base/templates/base/department/department_view.html
+++ b/base/templates/base/department/department_view.html
@@ -5,7 +5,7 @@
 			<div class="oh-sticky-table__tr">
 				<div class="oh-sticky-table__th">{% trans "Department" %}</div>
 				{% if perms.base.change_department or perms.base.delete_department %}
-					<div class="oh-sticky-table__th"></div>
+					<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 				{% endif %}
 			</div>
 		</div>
diff --git a/base/templates/base/dynamic_pagination/pagination_settings.html b/base/templates/base/dynamic_pagination/pagination_settings.html
index 369e52693..8285184ef 100644
--- a/base/templates/base/dynamic_pagination/pagination_settings.html
+++ b/base/templates/base/dynamic_pagination/pagination_settings.html
@@ -1,17 +1,23 @@
-{% extends 'settings.html' %} {% block settings %}{% load i18n %}
+{% load i18n %}
 
 <form action="{% url 'pagination-settings-view' %}" class='settings-label mb-1' method="post">
   {% csrf_token %}
   <div class="oh-inner-sidebar-content__header mt-4">
-    <h2 class="oh-inner-sidebar-content__title">{% trans "Default records per page" %}</h2>
+    <h2 class="oh-inner-sidebar-content__title">{% trans "Default Records Per Page" %}</h2>
   </div>
-   {{form}}
-    <button
-      type="submit"
-      class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
+  <div class="oh-label__info" for="pagination">
+    <label class="oh-label" for="pagination">{% trans "Pagination" %}</label> 
+    <span class="oh-info mr-2" title='{% trans "Default pagination for all views." %}'>
+    </span>
+  </div>
+  <input type="number" name="pagination" value="{{pagination_form.instance.pagination}}" class="oh-input w-25" placeholder="Pagination" required="" id="id_pagination">
+  <button
+    style="display: inline;margin-left: 10px;"
+    type="submit"
+    class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
     >
-      {% trans "Save Changes" %}
-    </button>
+    {% trans "Save Changes" %}
+  </button>
   <div class="oh-inner-sidebar-content__footer"></div>
 </form>
-{% endblock settings %}
+
diff --git a/base/templates/base/employee_type/type_view.html b/base/templates/base/employee_type/type_view.html
index 90b819b22..985b3925d 100644
--- a/base/templates/base/employee_type/type_view.html
+++ b/base/templates/base/employee_type/type_view.html
@@ -4,7 +4,7 @@
 		<div class="oh-sticky-table__thead">
 			<div class="oh-sticky-table__tr">
 				<div class="oh-sticky-table__th">{% trans "Employee Type" %}</div>
-				<div class="oh-sticky-table__th"></div>
+				<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 			</div>
 		</div>
 		<div class="oh-sticky-table__tbody">
diff --git a/base/templates/base/general_settings.html b/base/templates/base/general_settings.html
index 1f03a2aac..cc0405dc4 100644
--- a/base/templates/base/general_settings.html
+++ b/base/templates/base/general_settings.html
@@ -1,26 +1,39 @@
 {% extends 'settings.html' %} {% block settings %}{% load i18n %}
 
 {% if perms.recruitment.change_recruitmentgeneralsetting %}
-{% include "recruitment/settings/settings.html" %}
+    {% include "recruitment/settings/settings.html" %}
 {% endif %}
+
 {% if perms.offboarding.change_offboardinggeneralsetting %}
-{% include "offboarding/settings/settings.html" %}
+    {% include "offboarding/settings/settings.html" %}
 {% endif %}
+
 {% if perms.attendance.change_attendancegeneralsetting %}
-{% include "attendance/settings/settings.html" %}
+    {% include "attendance/settings/settings.html" %}
 {% endif %}
+
 {% if perms.payroll.change_payrollgeneralsetting %}
-{% include "payroll/settings/settings.html" %}
+    {% include "payroll/settings/settings.html" %}
 {% endif %}
+
 {% if perms.employee.change_employeegeneralsetting %}
-{% include "settings/settings.html" %}
+    {% include "settings/settings.html" %}
 {% endif %}
+
 {% if perms.base.change_announcementexpire %}
-{% include "announcement/expiry_day.html" %}
+    {% include "announcement/expiry_day.html" %}
 {% endif %}
+
 {% if perms.payroll.change_encashmentgeneralsetting %}
-{% include "settings/encashment_settings.html" %}
+    {% include "settings/encashment_settings.html" %}
 {% endif %}
+
 {% include "base/audit_tag/history_tracking_fields.html" %}
 {% include "base/audit_tag/employee_account_block_unblock.html" %}
+
+{% if perms.payroll.view_payrollsettings %}
+    {% include "payroll/settings/payroll_settings.html" %}
+{% endif %}
+
+{% include "base/dynamic_pagination/pagination_settings.html" %}
 {% endblock settings %}
\ No newline at end of file
diff --git a/base/templates/base/mail_server/mail_server_view.html b/base/templates/base/mail_server/mail_server_view.html
index fefb5141b..9d5cc54f6 100644
--- a/base/templates/base/mail_server/mail_server_view.html
+++ b/base/templates/base/mail_server/mail_server_view.html
@@ -23,7 +23,7 @@
           <div class="oh-sticky-table__td">{{ server.company_id }}</div>
           <div class="oh-sticky-table__td">
             <div class="oh-btn-group">
-              <a hx-get="{% url 'mail-server-create-update' %}?instance_id={{ server.id }}" onclick="event.stopPropagation()" hx-target="#mailServerModalBody" data-toggle="oh-modal-toggle" data-target="#mailServerModal" class="oh-btn oh-btn--light-bkg w-50" title="Edit"><ion-icon name="create-outline" role="img" class="md hydrated" aria-label="create outline"></ion-icon></a>
+              <a hx-get="{% url 'mail-server-create-update' %}?instance_id={{ server.id }}" onclick="event.stopPropagation()" hx-target="#mailServerModalBody" data-toggle="oh-modal-toggle" data-target="#mailServerModal" class="oh-btn oh-btn--light-bkg w-100" title="Edit"><ion-icon name="create-outline" role="img" class="md hydrated" aria-label="create outline"></ion-icon></a>
               <a href="{% url 'mail-server-delete' %}?ids={{ server.id }}" onclick="event.stopPropagation(); return confirm('Do you want to delete this mail server configuration?');" type="submit" class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="Remove"><ion-icon name="trash-outline" role="img" class="md hydrated" aria-label="trash outline"></ion-icon></a>
             </div>
           </div>
diff --git a/base/templates/base/rotating_shift/rotating_shift_view.html b/base/templates/base/rotating_shift/rotating_shift_view.html
index 9dce501f7..74576a2ce 100644
--- a/base/templates/base/rotating_shift/rotating_shift_view.html
+++ b/base/templates/base/rotating_shift/rotating_shift_view.html
@@ -6,7 +6,7 @@
 				<div class="oh-sticky-table__th">{% trans "Title" %}</div>
 				<div class="oh-sticky-table__th">{% trans "Shift 1" %}</div>
 				<div class="oh-sticky-table__th">{% trans "Shift 2" %}</div>
-				<div class="oh-sticky-table__th"></div>
+				<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 			</div>
 		</div>
 		<div class="oh-sticky-table__tbody">
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_view.html b/base/templates/base/rotating_work_type/rotating_work_type_view.html
index 42ac1eeaa..f0df20e43 100644
--- a/base/templates/base/rotating_work_type/rotating_work_type_view.html
+++ b/base/templates/base/rotating_work_type/rotating_work_type_view.html
@@ -7,7 +7,7 @@
 				<div class="oh-sticky-table__th">{% trans "Work Type 1" %}</div>
 				<div class="oh-sticky-table__th">{% trans "Work Type 2" %}</div>
 				{% if perms.base.change_rotatingworktype or perms.base.delete_rotatingworktype %}
-					<div class="oh-sticky-table__th"></div>
+					<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 				{% endif %}
 			</div>
 		</div>
diff --git a/base/templates/base/shift/shift_view.html b/base/templates/base/shift/shift_view.html
index 82bb7b38a..c8dcbaecd 100644
--- a/base/templates/base/shift/shift_view.html
+++ b/base/templates/base/shift/shift_view.html
@@ -10,7 +10,7 @@
 					<div class="oh-sticky-table__th">{% trans "Full Time" %}</div>
 					<div class="oh-sticky-table__th">{% trans "Grace Time" %}</div>
 					{% if perms.base.change_employeeshift or perms.base.delete_employeeshift %}
-						<div class="oh-sticky-table__th"></div>
+						<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 					{% endif %}
 				</div>
 			</div>
diff --git a/base/templates/base/work_type/work_type_view.html b/base/templates/base/work_type/work_type_view.html
index 84a4a0b42..46ff5e1ac 100644
--- a/base/templates/base/work_type/work_type_view.html
+++ b/base/templates/base/work_type/work_type_view.html
@@ -5,7 +5,7 @@
 			<div class="oh-sticky-table__tr">
 				<div class="oh-sticky-table__th">{% trans "Work Type" %}</div>
 				{% if perms.base.change_worktype or perms.base.delete_worktype %}
-					<div class="oh-sticky-table__th"></div>
+					<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 				{% endif %}
 			</div>
 		</div>
diff --git a/base/urls.py b/base/urls.py
index 60e818b6c..d07c7f4d8 100644
--- a/base/urls.py
+++ b/base/urls.py
@@ -579,7 +579,6 @@ urlpatterns = [
         views.delete_notification,
         name="delete-notifications",
     ),
-    path("settings/currency/", views.settings, name="currency-settings"),
     path("settings/general-settings/", views.general_settings, name="general-settings"),
     path("settings/date-settings/", views.date_settings, name="date-settings"),
     path("settings/save-date/", views.save_date_format, name="save_date_format"),
diff --git a/base/views.py b/base/views.py
index 82d9cf7b5..d923d9867 100644
--- a/base/views.py
+++ b/base/views.py
@@ -3829,22 +3829,6 @@ def all_notifications(request):
     )
 
 
-@login_required
-@permission_required("payroll.view_payrollsettings")
-def settings(request):
-    """
-    This method is used to render settings template
-    """
-    instance = PayrollSettings.objects.first()
-    form = PayrollSettingsForm(instance=instance)
-    if request.method == "POST":
-        form = PayrollSettingsForm(request.POST, instance=instance)
-        if form.is_valid():
-            form.save()
-            messages.success(request, _("Payroll settings updated."))
-    return render(request, "payroll/settings/payroll_settings.html", {"form": form})
-
-
 @login_required
 def general_settings(request):
     """
@@ -3867,6 +3851,13 @@ def general_settings(request):
             ]
         }
     history_fields_form = HistoryTrackingFieldsForm(initial=history_fields_form_initial)
+    currency_instance = PayrollSettings.objects.first()
+    currency_form = PayrollSettingsForm(instance=currency_instance)
+    if DynamicPagination.objects.filter(user_id=request.user).exists():
+        pagination = DynamicPagination.objects.filter(user_id=request.user).first()
+        pagination_form = DynamicPaginationForm(instance=pagination)
+    else:
+        pagination_form = DynamicPaginationForm()
     if request.method == "POST":
         form = AnnouncementExpireForm(request.POST, instance=instance)
         if form.is_valid():
@@ -3878,6 +3869,8 @@ def general_settings(request):
         "base/general_settings.html",
         {
             "form": form,
+            "currency_form": currency_form,
+            "pagination_form":pagination_form,
             "encashment_form": encashment_form,
             "history_fields_form": history_fields_form,
             "enabled_block_unblock": enabled_block_unblock,
@@ -4372,7 +4365,7 @@ def ticket_type_update(request, t_type_id):
 def ticket_type_delete(request, t_type_id):
     TicketType.objects.get(id=t_type_id).delete()
     messages.success(request, _("Ticket type has been deleted successfully!"))
-    return HttpResponse("<script>window.location.reload()</script>")
+    return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
 
 
 @login_required
@@ -5042,24 +5035,22 @@ def delete_worktyperequest_comment(request, comment_id):
 def pagination_settings_view(request):
     if DynamicPagination.objects.filter(user_id=request.user).exists():
         pagination = DynamicPagination.objects.filter(user_id=request.user).first()
-        form = DynamicPaginationForm(instance=pagination)
+        pagination_form = DynamicPaginationForm(instance=pagination)
         if request.method == "POST":
-            form = DynamicPaginationForm(request.POST, instance=pagination)
-            if form.is_valid():
-                form.save()
+            pagination_form = DynamicPaginationForm(request.POST, instance=pagination)
+            if pagination_form.is_valid():
+                pagination_form.save()
                 messages.success(request, _("Default pagination updated."))
     else:
-        form = DynamicPaginationForm()
+        pagination_form = DynamicPaginationForm()
         if request.method == "POST":
-            form = DynamicPaginationForm(
+            pagination_form = DynamicPaginationForm(
                 request.POST,
             )
-            if form.is_valid():
-                form.save()
+            if pagination_form.is_valid():
+                pagination_form.save()
                 messages.success(request, _("Default pagination updated."))
-    return render(
-        request, "base/dynamic_pagination/pagination_settings.html", {"form": form}
-    )
+    return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
 
 
 @login_required