diff --git a/hypha/apply/activity/adapters/utils.py b/hypha/apply/activity/adapters/utils.py
index 67c5388d4f..ea3c01574c 100644
--- a/hypha/apply/activity/adapters/utils.py
+++ b/hypha/apply/activity/adapters/utils.py
@@ -133,4 +133,4 @@ def get_users_for_groups(groups, user_queryset=None, exact_match=False):
             user_queryset = user_queryset.filter(groups__name=groups.pop().name)
         return get_users_for_groups(groups, user_queryset=user_queryset)
     else:
-        return user_queryset
+        return user_queryset if user_queryset is not None else set()
diff --git a/hypha/apply/projects/forms/payment.py b/hypha/apply/projects/forms/payment.py
index a48c0d2e63..c830156390 100644
--- a/hypha/apply/projects/forms/payment.py
+++ b/hypha/apply/projects/forms/payment.py
@@ -4,6 +4,7 @@
 from django.core.files.base import ContentFile
 from django.db import transaction
 from django.db.models.fields.files import FieldFile
+from django.forms.widgets import RadioSelect
 from django.utils.translation import gettext_lazy as _
 from django_file_form.forms import FileFormMixin
 
@@ -69,16 +70,22 @@ class ChangeInvoiceStatusForm(forms.ModelForm):
     class Meta:
         fields = ["status", "paid_date", "comment"]
         model = Invoice
+        widgets = {"status": RadioSelect}
 
-    def __init__(self, instance, user, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop("user")
+        instance = kwargs.pop("instance")
         super().__init__(*args, **kwargs, instance=instance)
-        self.initial["comment"] = ""
-        status_field = self.fields["status"]
-
-        status_field.choices = get_invoice_possible_transition_for_user(
+        invoice_choices = get_invoice_possible_transition_for_user(
             user, invoice=instance
         )
 
+        self.initial["comment"] = ""
+        if len(invoice_choices) > 4:
+            self.fields["status"] = forms.TypedChoiceField(choices=invoice_choices)
+        else:
+            self.fields["status"].choices = invoice_choices
+
 
 class InvoiceBaseForm(forms.ModelForm):
     class Meta:
diff --git a/hypha/apply/projects/templates/application_projects/includes/invoices.html b/hypha/apply/projects/templates/application_projects/includes/invoices.html
index e908dc0cad..7600633b32 100644
--- a/hypha/apply/projects/templates/application_projects/includes/invoices.html
+++ b/hypha/apply/projects/templates/application_projects/includes/invoices.html
@@ -18,95 +18,13 @@
                     <tr>
                         <th class="data-block__table-date">{% trans "Date submitted" %}</th>
                         <th class="min-w-[180px] w-[15%]">{% trans "Invoice date" %}</th>
-                        <th class="data-block__table-amount">{% trans "Invoice No." %}</th>
+                        <th class="data-block__table-amount">{% trans "Invoice no." %}</th>
                         <th class="data-block__table-status">{% trans "Status" %}</th>
                         <th class="data-block__table-update"></th>
                     </tr>
                 </thead>
-                <tbody>
-                    {% for invoice in object.invoices.not_rejected %}
-                        {% display_invoice_status_for_user user invoice as invoice_status %}
-                        <tr>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Date submitted" %}: </span>{{ invoice.requested_at.date }}</td>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice date" %}: </span>{% if invoice.invoice_date %}{{ invoice.invoice_date }}{% else %} {{ invoice.requested_at.date }} {% endif %}</td>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice number" %}: </span>{{ invoice.invoice_number }}</td>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Status" %}: </span>{{ invoice_status }}</td>
-                            <td class="flex flex-wrap justify-center py-4 px-0 gap-2 xl:flex-nowrap">
-                                <a class="data-block__action-icon-link" href="{{ invoice.get_absolute_url }}" >
-                                    {% heroicon_micro "eye" aria_hidden=true class="me-1" %}
-                                    {% trans "View" %}
-                                </a>
-                                {% can_edit invoice user as user_can_edit_request %}
-                                {% if user_can_edit_request %}
-                                    <a class="data-block__action-icon-link" href="{% url "apply:projects:invoice-edit" pk=invoice.project.pk invoice_pk=invoice.pk %}">
-                                        {% heroicon_micro "pencil-square" aria_hidden=true class="me-1" %}
-                                        {% trans "Edit" %}
-                                    </a>
-                                {% endif %}
-
-                                {% can_delete invoice user as user_can_delete_request %}
-                                {% if user.is_applicant and user_can_delete_request %}
-                                    <a class="data-block__action-icon-link text-red-500" href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}">
-                                        {% heroicon_micro "trash" aria_hidden=true class="me-1" %}
-                                        {% trans "Delete" %}
-                                    </a>
-                                {% endif %}
-                                {% can_change_status invoice user as can_change_invoice_status %}
-                                {% if can_change_invoice_status %}
-                                    <a
-                                        data-fancybox
-                                        data-src="#change-invoice-status-{{ invoice.id }}"
-                                        id="update_invoice_status-{{ invoice.id }}"
-                                        class="data-block__button button button--primary"
-                                        href="#"
-                                    >
-                                        {% trans "Update Status" %}
-                                    </a>
-                                    <div class="modal" id="change-invoice-status-{{ invoice.id }}">
-                                        {% get_invoice_form invoice user as invoice_form %}
-                                        {% get_invoice_form_id invoice_form invoice as invoice_form_id %}
-                                        <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
-                                        <p>{% trans "Current status" %}: {{ invoice_status }}</p>
-                                        {% trans "Update Status" as update %}
-                                        {% include 'funds/includes/delegated_form_base.html' with form=invoice_form value=update action=invoice.get_absolute_url form_id=invoice_form_id %}
-                                    </div>
-                                    <script>
-                                        document.addEventListener("DOMContentLoaded", function () {
-                                            const invoice_form = document.querySelector('[id^={{ invoice_form_id }}')
-                                            const invoice_status = invoice_form.querySelector('#id_status');
-                                            const paid_field = invoice_form.querySelector('.id_paid_date');
-                                            var paid_date = invoice_form.querySelector('#id_paid_date');
-
-                                            function updatePaidDate(){
-                                                if (invoice_status.value === 'paid') {
-                                                    paid_field.style.display = 'block';
-                                                    if (!paid_date.value) {
-                                                        // Get today's date
-                                                        const now = new Date();
-                                                        const year = now.getFullYear();
-                                                        const month = String(now.getMonth() + 1).padStart(2, '0'); // Months are zero-based
-                                                        const day = String(now.getDate()).padStart(2, '0');
-
-                                                        // Format the date as YYYY-MM-DD
-                                                        const today = `${year}-${month}-${day}`;
-
-                                                        paid_date.value = today;
-                                                    }
-                                                } else {
-                                                    paid_field.style.display = 'none';
-                                                    paid_date.value = '';
-                                                }
-                                            }
-
-                                            updatePaidDate();
-
-                                            invoice_status.onchange = updatePaidDate;
-                                        });
-                                    </script>
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endfor %}
+                <tbody hx-get="{% url 'apply:projects:partial-invoices-status' pk=object.pk %}" hx-trigger="invoicesUpdated from:body">
+                    {% include "application_projects/partials/invoice_status_table.html" with invoices=object.invoices.not_rejected rejected=False %}
                 </tbody>
             </table>
         {% else %}
@@ -123,27 +41,13 @@ <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
                     <tr>
                         <th class="data-block__table-date">{% trans "Date submitted" %}</th>
                         <th class="min-w-[180px] w-[15%]">{% trans "Invoice date" %}</th>
-                        <th class="data-block__table-amount">{% trans "Invoice number" %}</th>
+                        <th class="data-block__table-amount">{% trans "Invoice no." %}</th>
                         <th class="data-block__table-status">{% trans "Status" %}</th>
                         <th class="data-block__table-update"></th>
                     </tr>
                 </thead>
-                <tbody>
-                    {% for invoice in object.invoices.rejected %}
-                        {% display_invoice_status_for_user user invoice as invoice_status %}
-                        <tr>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Date submitted" %}: </span>{{ invoice.requested_at.date }}</td>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice date" %}: </span>{% if invoice.invoice_date %}{{ invoice.invoice_date }}{% else %} {{ invoice.requested_at.date }} {% endif %}</td>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice number" %}: </span>{{ invoice.invoice_number }}</td>
-                            <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Status" %}: </span>{{ invoice_status }}</td>
-                            <td class="flex justify-end py-4 px-0">
-                                <a class="data-block__action-icon-link" href="{{ invoice.get_absolute_url }}" >
-                                    {% heroicon_mini "eye" size=16 aria_hidden=true class="me-1" %}
-                                    {% trans "View" %}
-                                </a>
-                            </td>
-                        </tr>
-                    {% endfor %}
+                <tbody id="rejected-invoice-table" hx-get="{% url 'apply:projects:partial-rejected-invoices-status' pk=object.pk %}" hx-trigger="rejectedInvoicesUpdated from:body">
+                    {% include "application_projects/partials/invoice_status_table.html" with invoices=object.invoices.rejected rejected=True %}
                 </tbody>
             </table>
         {% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/update_invoice_form.html b/hypha/apply/projects/templates/application_projects/includes/update_invoice_form.html
new file mode 100644
index 0000000000..d2ec4b8e55
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/includes/update_invoice_form.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+
+{% modal_title %}Update Invoice Status{% endmodal_title %}
+
+<form class="p-4"
+      method="POST"
+      action="{{ request.path }}"
+      hx-post="{{ request.path }}"
+>
+    <p class="mt-0 text-fg-muted">{% trans "Current status" %}: {{ invoice_status }}</p>
+
+    {% include 'funds/includes/dialog_form_base.html' with form=form value=value form_id=form_id %}
+</form>
\ No newline at end of file
diff --git a/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html b/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html
index 0bce3742be..a32e945518 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html
@@ -7,38 +7,8 @@
     {% endif %}
 {% endblock %}
 
-{% block actions %}
-    {{ block.super }}
-    {% can_change_status object user as user_can_change_status %}
-    <a
-        {% if user_can_change_status %}
-            data-fancybox
-            data-src="#change-status"
-        {% endif %}
-        id="update_invoice_status"
-        class="button button--bottom-space button--primary button--full-width{% if not user_can_change_status %} button--tooltip-disabled{% endif %}"
-        href="#"
-    >
-        {% trans "Update Invoice Status" %}
-    </a>
-    {% if user_can_change_status %}
-        <div class="modal" id="change-status">
-            <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
-            <p>{% trans "Current status" %}: {{ object.status_display }}</p>
-            {% trans "Update Status" as update %}
-            {% include 'funds/includes/delegated_form_base.html' with form=change_invoice_status value=update %}
-        </div>
-    {% endif %}
-{% endblock %}
-
-{% block extra_css %}
-    <link rel="stylesheet" href="{% static 'css/fancybox.css' %}">
-{% endblock %}
-
 {% block extra_js %}
     {{ block.super }}
-    <script src="{% static 'js/jquery.fancybox.min.js' %}"></script>
-    <script src="{% static 'js/fancybox-global.js' %}"></script>
     <script src="{% static 'js/deliverables.js' %}"></script>
 
     <script>
diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html
index 632b31b047..6daf48428e 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_detail.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html
@@ -31,47 +31,9 @@
                 {% endif %}
                 <p class="card__text"><b>{% trans "Fund" %}:</b> {{ object.project.submission.page }}</p>
             </div>
-            <div class="flex card card--solid" x-data="{ collapsed: true }">
-                <div class="flex-none">
-                    <p><b>{% trans "Status" %}: </b></p>
-                </div>
-                <div class="ps-2">
-                    {% extract_status latest_activity user as latest_activity_status %}
-                    {% get_comment_for_invoice_action object latest_activity as latest_activity_comment %}
-                    <p>{{ latest_activity_status }} {% if user.is_applicant and latest_activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ latest_activity.user }}){% endif %}
-                        <span class="text-gray-400">{{ latest_activity.timestamp }}</span>
-                        {% if latest_activity_comment %}
-                            <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
-                            <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ latest_activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
-                        {% endif %}
-                    </p>
-                    {% for activity in activities %}
-                        {% extract_status activity user as activity_status %}
-                        {% get_comment_for_invoice_action object activity as activity_comment %}
-                        <p x-show="!collapsed">{{ activity_status }} {% if user.is_applicant and activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ activity.user }}){% endif %}
-                            <span class="text-gray-400">{{ activity.timestamp }}</span>
-                            {% if activity_comment %}
-                                <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
-                                <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
-                            {% endif %}
-                        </p>
-                    {% endfor %}
-                </div>
-                <button
-                    type="button"
-                    class="flex-1 font-bold transition-opacity text-light-blue text-end hover:opacity-70"
-                    x-on:click="collapsed = ! collapsed"
-                >
-                    <span x-show="collapsed">
-                        {% trans "Show" %}
-                        {% heroicon_mini "arrow-down" class="inline align-text-bottom" aria_hidden=true %}
-                    </span>
-                    <span x-show="!collapsed">
-                        {% trans "Hide" %}
-                        {% heroicon_mini "arrow-up" class="inline align-text-bottom" aria_hidden=true %}
-                    </span>
-
-                </button>
+            <div hx-get="{% url 'apply:projects:partial-invoice-status' pk=object.project.pk invoice_pk=object.pk %}" hx-trigger="load, invoicesUpdated from:body" class="flex card card--solid" x-data="{ collapsed: true }">
+                <div class="flex-none content-center min-h-10"><div class="h-4 min-w-96 bg-gray-400 rounded-full animate-pulse"></div></div>
+                <div class="ps-2"></div>
             </div>
 
             <div class="card card--solid">
@@ -93,34 +55,8 @@ <h5 class="card__heading">{% trans "Supporting Documents" %}</h5>
         <aside class="sidebar">
             {% block deliverables %}
             {% endblock %}
-            <div class="sticky js-actions-sidebar sidebar__inner sidebar__inner--light-blue sidebar__inner--actions top-8" data-testid="sidebar-primary-actions">
-                <h5>{% trans "Actions to take" %}</h5>
-                {% block actions %}
-                    {% can_edit object user as user_can_edit_request %}
-                    {% if user.is_apply_staff or user.is_applicant %}
-                        <a
-                            {% if not user_can_edit_request %}
-                                data-tooltip="{% trans "Only editable when 'Submitted' or you have been requested to make changes" %}"
-                            {% endif %}
-                            class="button button--bottom-space button--primary button--full-width{% if not user_can_edit_request %} button--tooltip-disabled{% endif %}"
-                            href={% if user_can_edit_request %}
-                                 "{% url "apply:projects:invoice-edit" pk=object.project.pk invoice_pk=object.pk %}"
-                            {% else %}
-                                 "#"
-                            {% endif %}
-                        >
-                            {% trans "Edit Invoice" %}
-                        </a>
-                    {% endif %}
-                    {% can_delete object user as user_can_delete_request %}
-                    {% if user_can_delete_request %}
-                        <a
-                            class="button button--bottom-space button--primary button--full-width"
-                            href="{% url 'apply:projects:invoice-delete' pk=object.project.pk invoice_pk=object.pk %}">
-                            {% trans "Delete Invoice" %}
-                        </a>
-                    {% endif %}
-                {% endblock %}
+            <div hx-get="{% url 'apply:projects:partial-invoice-detail-actions' pk=object.project.pk invoice_pk=object.pk %}" hx-trigger="invoicesUpdated from:body" class="sticky js-actions-sidebar sidebar__inner sidebar__inner--light-blue sidebar__inner--actions top-8" data-testid="sidebar-primary-actions">
+                {% include "application_projects/partials/invoice_detail_actions.html" %}
             </div>
         </aside>
     </div>
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html b/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html
new file mode 100644
index 0000000000..a86e0957d7
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html
@@ -0,0 +1,46 @@
+{% load i18n invoice_tools %}
+
+<h5>{% trans "Actions to take" %}</h5>
+{% can_edit object user as user_can_edit_request %}
+{% if user.is_apply_staff or user.is_applicant %}
+    <a
+        {% if not user_can_edit_request %}
+            data-tooltip="{% trans "Only editable when 'Submitted' or you have been requested to make changes" %}"
+        {% endif %}
+        class="button button--bottom-space button--primary button--full-width{% if not user_can_edit_request %} button--tooltip-disabled{% endif %}"
+        href={% if user_can_edit_request %}
+             "{% url "apply:projects:invoice-edit" pk=object.project.pk invoice_pk=object.pk %}"
+        {% else %}
+             "#"
+        {% endif %}
+    >
+        {% trans "Edit Invoice" %}
+    </a>
+{% endif %}
+{% can_delete object user as user_can_delete_request %}
+{% if user_can_delete_request %}
+    <a
+        class="button button--bottom-space button--primary button--full-width"
+        href="{% url 'apply:projects:invoice-delete' pk=object.project.pk invoice_pk=object.pk %}">
+        {% trans "Delete Invoice" %}
+    </a>
+{% endif %}
+
+{% if user.is_org_faculty %}
+    {% can_change_status object user as user_can_change_status %}
+    {% if user_can_change_status %}
+        <button class="button button--bottom-space button--primary button--full-width" hx-get="{% url 'apply:projects:invoice-update' pk=object.project.pk invoice_pk=object.pk %}" hx-target="#htmx-modal">
+            {% trans "Update Status" %}
+        </button>
+        <div class="modal" id="change-status">
+            <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
+            <p>{% trans "Current status" %}: {{ object.status_display }}</p>
+            {% trans "Update Status" as update %}
+            {% include 'funds/includes/delegated_form_base.html' with form=change_invoice_status value=update %}
+        </div>
+    {% else %}
+        <button class="button button--bottom-space button--primary button--full-width" disabled>
+            {% trans "Update Status" %}
+        </button>
+    {% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_status.html b/hypha/apply/projects/templates/application_projects/partials/invoice_status.html
new file mode 100644
index 0000000000..2277b67ae7
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_status.html
@@ -0,0 +1,43 @@
+{% load i18n invoice_tools heroicons %}
+
+<div class="flex-none">
+    <p><b>{% trans "Status" %}: </b></p>
+</div>
+<div class="ps-2">
+    {% extract_status latest_activity user as latest_activity_status %}
+    {% get_comment_for_invoice_action object latest_activity as latest_activity_comment %}
+    <p>{{ latest_activity_status }} {% if user.is_applicant and latest_activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ latest_activity.user }}){% endif %}
+        <span class="text-gray-400">{{ latest_activity.timestamp }}</span>
+        {% if latest_activity_comment %}
+            <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
+            <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ latest_activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
+        {% endif %}
+    </p>
+    {% for activity in activities %}
+        {% extract_status activity user as activity_status %}
+        {% get_comment_for_invoice_action object activity as activity_comment %}
+        <p x-show="!collapsed">{{ activity_status }} {% if user.is_applicant and activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ activity.user }}){% endif %}
+            <span class="text-gray-400">{{ activity.timestamp }}</span>
+            {% if activity_comment %}
+                <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
+                <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
+            {% endif %}
+        </p>
+    {% endfor %}
+</div>
+{% if activities %}
+    <button
+        type="button"
+        class="flex-1 font-bold transition-opacity text-light-blue text-end hover:opacity-70"
+        x-on:click="collapsed = ! collapsed"
+    >
+        <span x-show="collapsed">
+            {% trans "Show" %}
+            {% heroicon_mini "arrow-down" class="inline align-text-bottom" aria_hidden=true %}
+        </span>
+        <span x-show="!collapsed">
+            {% trans "Hide" %}
+            {% heroicon_mini "arrow-up" class="inline align-text-bottom" aria_hidden=true %}
+        </span>
+    </button>
+{% endif %}
\ No newline at end of file
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html b/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
new file mode 100644
index 0000000000..6a9f192f60
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
@@ -0,0 +1,40 @@
+{% load i18n invoice_tools heroicons %}
+
+{% for invoice in invoices %}
+    <tr>
+        {% display_invoice_status_for_user user invoice as invoice_status %}
+        <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Date submitted" %}: </span>{{ invoice.requested_at.date }}</td>
+        <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice date" %}: </span>{% if invoice.invoice_date %}{{ invoice.invoice_date }}{% else %} {{ invoice.requested_at.date }} {% endif %}</td>
+        <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice no." %}: </span>{{ invoice.invoice_number }}</td>
+        <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Status" %}: </span>{{ invoice_status }}</td>
+        <td class="flex flex-wrap justify-center py-4 px-0 gap-2 xl:flex-nowrap">
+            <a class="data-block__action-icon-link" href="{{ invoice.get_absolute_url }}" >
+                {% heroicon_micro "eye" aria_hidden=true class="me-1" %}
+                {% trans "View" %}
+            </a>
+            {% if not rejected %}
+                {% can_edit invoice user as user_can_edit_request %}
+                {% if user_can_edit_request %}
+                    <a class="data-block__action-icon-link" href="{% url "apply:projects:invoice-edit" pk=invoice.project.pk invoice_pk=invoice.pk %}">
+                        {% heroicon_micro "pencil-square" aria_hidden=true class="me-1" %}
+                        {% trans "Edit" %}
+                    </a>
+                {% endif %}
+
+                {% can_delete invoice user as user_can_delete_request %}
+                {% if user.is_applicant and user_can_delete_request %}
+                    <a class="data-block__action-icon-link text-red-500" href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}">
+                        {% heroicon_micro "trash" aria_hidden=true class="me-1" %}
+                        {% trans "Delete" %}
+                    </a>
+                {% endif %}
+                {% can_change_status invoice user as can_change_invoice_status %}
+                {% if can_change_invoice_status %}
+                    <button class="data-block__button button button--primary" hx-get="{% url 'apply:projects:invoice-update' pk=invoice.project.pk invoice_pk=invoice.pk %}" hx-target="#htmx-modal">
+                        {% trans "Update Status" %}
+                    </button>
+                {% endif %}
+            {% endif %}
+        </td>
+    </tr>
+{% endfor %}
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index bafb971a37..a9110b3947 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -11,6 +11,7 @@
 from django.utils import timezone
 
 from hypha.apply.funds.tests.factories import LabSubmissionFactory
+from hypha.apply.projects.utils import get_invoice_status_display_value
 from hypha.apply.users.tests.factories import (
     ApplicantFactory,
     ApproverFactory,
@@ -27,7 +28,7 @@
 from ...funds.models.forms import ApplicationBaseProjectReportForm
 from ..files import get_files
 from ..forms import SetPendingForm
-from ..models.payment import CHANGES_REQUESTED_BY_STAFF, SUBMITTED
+from ..models.payment import CHANGES_REQUESTED_BY_STAFF, DECLINED, SUBMITTED
 from ..models.project import (
     APPROVE,
     CLOSING,
@@ -1082,12 +1083,112 @@ def test_can(self):
                 "comment": "this is a comment",
             },
         )
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 204)
+        self.assertTrue("invoicesUpdated" in response.headers.get("HX-Trigger", ""))
         invoice.refresh_from_db()
         self.assertEqual(invoice.status, CHANGES_REQUESTED_BY_STAFF)
 
+    def test_can_view_updated_invoice_table(self):
+        project = ProjectFactory()
+        invoice = InvoiceFactory(project=project)
+        response = self.post_page(
+            invoice,
+            {
+                "form-submitted-change_invoice_status": "",
+                "status": CHANGES_REQUESTED_BY_STAFF,
+                "comment": "this is a comment",
+            },
+        )
+        self.assertEqual(response.status_code, 204)
+        self.assertTrue("invoicesUpdated" in response.headers.get("HX-Trigger", ""))
+        response = self.client.get(
+            reverse(
+                "apply:projects:partial-invoices-status", kwargs={"pk": project.pk}
+            ),
+            secure=True,
+            follow=True,
+        )
+        self.assertContains(
+            response, get_invoice_status_display_value(CHANGES_REQUESTED_BY_STAFF)
+        )
+
+    def test_can_view_updated_rejected_invoice_table(self):
+        project = ProjectFactory()
+        invoice = InvoiceFactory(project=project)
+        response = self.post_page(
+            invoice,
+            {
+                "form-submitted-change_invoice_status": "",
+                "status": DECLINED,
+                "comment": "this is a comment",
+            },
+        )
+        self.assertEqual(response.status_code, 204)
+        self.assertTrue("invoicesUpdated" in response.headers.get("HX-Trigger", ""))
+        self.assertTrue(
+            "rejectedInvoicesUpdated" in response.headers.get("HX-Trigger", "")
+        )
+        response = self.client.get(
+            reverse(
+                "apply:projects:partial-invoices-status", kwargs={"pk": project.pk}
+            ),
+            secure=True,
+            follow=True,
+        )
+        self.assertNotContains(response, get_invoice_status_display_value(DECLINED))
+
+        rejected_response = self.client.get(
+            reverse(
+                "apply:projects:partial-rejected-invoices-status",
+                kwargs={"pk": project.pk},
+            ),
+            secure=True,
+            follow=True,
+        )
+        self.assertContains(
+            rejected_response, get_invoice_status_display_value(DECLINED)
+        )
+
+    def test_can_view_updated_invoice_status(self):
+        project = ProjectFactory()
+        invoice = InvoiceFactory(project=project)
+
+        response = self.client.get(
+            reverse(
+                "apply:projects:partial-invoice-status",
+                kwargs={"pk": project.pk, "invoice_pk": invoice.pk},
+            ),
+            secure=True,
+            follow=True,
+        )
+        self.assertNotContains(
+            response, get_invoice_status_display_value(CHANGES_REQUESTED_BY_STAFF)
+        )
+
+        response = self.post_page(
+            invoice,
+            {
+                "form-submitted-change_invoice_status": "",
+                "status": CHANGES_REQUESTED_BY_STAFF,
+                "comment": "this is a comment",
+            },
+        )
+        self.assertEqual(response.status_code, 204)
+        self.assertTrue("invoicesUpdated" in response.headers.get("HX-Trigger", ""))
+        response = self.client.get(
+            reverse(
+                "apply:projects:partial-invoice-status",
+                kwargs={"pk": project.pk, "invoice_pk": invoice.pk},
+            ),
+            secure=True,
+            follow=True,
+        )
+        self.assertContains(
+            response, get_invoice_status_display_value(CHANGES_REQUESTED_BY_STAFF)
+        )
+
 
-class TestApplicantChangeInoviceStatus(BaseViewTestCase):
+class TestApplicantChangeInvoiceStatus(BaseViewTestCase):
     base_view_name = "invoice-detail"
     url_name = "funds:projects:{}"
     user_factory = ApplicantFactory
@@ -1122,7 +1223,7 @@ def test_other_cant(self):
         self.assertEqual(invoice.status, SUBMITTED)
 
 
-class TestStaffInoviceDocumentPrivateMedia(BaseViewTestCase):
+class TestStaffInvoiceDocumentPrivateMedia(BaseViewTestCase):
     base_view_name = "invoice-document"
     url_name = "funds:projects:{}"
     user_factory = StaffFactory
diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py
index 65790a3484..1dbea7282d 100644
--- a/hypha/apply/projects/urls.py
+++ b/hypha/apply/projects/urls.py
@@ -3,6 +3,7 @@
 
 from .views import (
     CategoryTemplatePrivateMediaView,
+    ChangeInvoiceStatusView,
     ChangePAFStatusView,
     ContractDocumentPrivateMediaView,
     ContractPrivateMediaView,
@@ -33,6 +34,9 @@
     UploadDocumentView,
     get_invoices_status_counts,
     get_project_status_counts,
+    partial_get_invoice_detail_actions,
+    partial_get_invoice_status,
+    partial_get_invoice_status_table,
     partial_project_activities,
     partial_supporting_documents,
 )
@@ -134,6 +138,17 @@
                     name="download-sow",
                 ),
                 path("invoice/", CreateInvoiceView.as_view(), name="invoice"),
+                path(
+                    "partial/invoice-status/",
+                    partial_get_invoice_status_table,
+                    name="partial-invoices-status",
+                ),
+                path(
+                    "partial/rejected-invoice-status/",
+                    partial_get_invoice_status_table,
+                    {"rejected": True},
+                    name="partial-rejected-invoices-status",
+                ),
                 path(
                     "invoices/<int:invoice_pk>/",
                     include(
@@ -142,11 +157,26 @@
                             path(
                                 "edit/", EditInvoiceView.as_view(), name="invoice-edit"
                             ),
+                            path(
+                                "update/",
+                                ChangeInvoiceStatusView.as_view(),
+                                name="invoice-update",
+                            ),
                             path(
                                 "delete/",
                                 DeleteInvoiceView.as_view(),
                                 name="invoice-delete",
                             ),
+                            path(
+                                "partial/status/",
+                                partial_get_invoice_status,
+                                name="partial-invoice-status",
+                            ),
+                            path(
+                                "actions/",
+                                partial_get_invoice_detail_actions,
+                                name="partial-invoice-detail-actions",
+                            ),
                             path(
                                 "documents/invoice/",
                                 InvoicePrivateMedia.as_view(),
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index d73407f9aa..b9f40d60ac 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -37,6 +37,9 @@
 from .project_partials import (
     get_invoices_status_counts,
     get_project_status_counts,
+    partial_get_invoice_detail_actions,
+    partial_get_invoice_status,
+    partial_get_invoice_status_table,
     partial_project_activities,
     partial_supporting_documents,
 )
@@ -52,6 +55,9 @@
 __all__ = [
     "partial_project_activities",
     "partial_supporting_documents",
+    "partial_get_invoice_status_table",
+    "partial_get_invoice_status",
+    "partial_get_invoice_detail_actions",
     "get_invoices_status_counts",
     "get_project_status_counts",
     "ChangeInvoiceStatusView",
diff --git a/hypha/apply/projects/views/payment.py b/hypha/apply/projects/views/payment.py
index 4285bc950c..39eb4716ad 100644
--- a/hypha/apply/projects/views/payment.py
+++ b/hypha/apply/projects/views/payment.py
@@ -1,9 +1,12 @@
+import json
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
-from django.shortcuts import get_object_or_404, redirect
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -21,6 +24,9 @@
 
 from hypha.apply.activity.messaging import MESSAGES, messenger
 from hypha.apply.activity.models import APPLICANT, COMMENT, Activity
+from hypha.apply.projects.templatetags.invoice_tools import (
+    display_invoice_status_for_user,
+)
 from hypha.apply.todo.options import (
     INVOICE_REQUIRED_CHANGES,
     INVOICE_WAITING_APPROVAL,
@@ -52,6 +58,7 @@
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
     CHANGES_REQUESTED_BY_STAFF,
+    DECLINED,
     INVOICE_TRANISTION_TO_RESUBMITTED,
     Invoice,
 )
@@ -86,18 +93,38 @@ class ChangeInvoiceStatusView(DelegatedViewMixin, InvoiceAccessMixin, UpdateView
     form_class = ChangeInvoiceStatusForm
     context_name = "change_invoice_status"
     model = Invoice
+    template = "application_projects/includes/update_invoice_form.html"
+
+    def dispatch(self, request, *args, **kwargs):
+        self.object: Invoice = get_object_or_404(Invoice, id=kwargs.get("invoice_pk"))
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        if not (form := kwargs.get("form")):
+            form = self.form_class(instance=self.object, user=self.request.user)
+
+        form.name = self.context_name
+
+        extras = {
+            "form": form,
+            "form_id": f"{form.name}-{self.object.id}",
+            "invoice_status": display_invoice_status_for_user(
+                self.request.user, self.object
+            ),
+            "value": _("Update status"),
+            "object": self.object,
+        }
+
+        return {**kwargs, **extras}
 
     def form_valid(self, form):
-        invoice = get_object_or_404(
-            Invoice, pk=self.kwargs["invoice_pk"]
-        )  # to get the old status
-        old_status = invoice.status
+        old_status = self.object.status
         response = super().form_valid(form)
         if form.cleaned_data["comment"]:
             invoice_status_change = _(
                 "<p>Invoice status updated to: {status}.</p>"
             ).format(status=self.object.get_status_display())
-            comment = f"<p>{self.object.comment}.</p>"
+            comment = f"<p>{self.object.comment}</p>"
 
             message = invoice_status_change + comment
 
@@ -133,6 +160,35 @@ def form_valid(self, form):
 
         return response
 
+    def get(self, *args, **kwargs):
+        form_instance = self.form_class(instance=self.object, user=self.request.user)
+        form_instance.name = self.context_name
+
+        return render(self.request, self.template, self.get_context_data())
+
+    def post(self, *args, **kwargs):
+        # Don't process the post request if the user can't change the status
+        if not self.object.can_user_change_status(self.request.user):
+            return render(
+                self.request, self.template, self.get_context_data(), status=403
+            )
+
+        form = self.form_class(
+            self.request.POST, instance=self.object, user=self.request.user
+        )
+        if form.is_valid():
+            self.form_valid(form)
+            htmx_headers = {"invoicesUpdated": None, "showMessage": "Invoice updated."}
+            if self.object.status == DECLINED:
+                htmx_headers.update({"rejectedInvoicesUpdated": None})
+            return HttpResponse(
+                status=204, headers={"HX-Trigger": json.dumps(htmx_headers)}
+            )
+
+        return render(
+            self.request, self.template, self.get_context_data(form=form), status=400
+        )
+
 
 class DeleteInvoiceView(DeleteView):
     model = Invoice
@@ -177,31 +233,12 @@ def get_context_data(self, **kwargs):
         invoice = self.get_object()
         project = invoice.project
         deliverables = project.deliverables.all()
-        invoice_activities = Activity.actions.filter(
-            related_content_type__model="invoice", related_object_id=invoice.id
-        ).visible_to(self.request.user)
-        return super().get_context_data(
-            **kwargs,
-            deliverables=deliverables,
-            latest_activity=invoice_activities.first(),
-            activities=invoice_activities[1:],
-        )
+        return super().get_context_data(**kwargs, deliverables=deliverables)
 
 
 class InvoiceApplicantView(InvoiceAccessMixin, DelegateableView, DetailView):
     form_views = []
 
-    def get_context_data(self, **kwargs):
-        invoice = self.get_object()
-        invoice_activities = Activity.actions.filter(
-            related_content_type__model="invoice", related_object_id=invoice.id
-        ).visible_to(self.request.user)
-        return super().get_context_data(
-            **kwargs,
-            latest_activity=invoice_activities.first(),
-            activities=invoice_activities[1:],
-        )
-
 
 class InvoiceView(ViewDispatcher):
     admin_view = InvoiceAdminView
diff --git a/hypha/apply/projects/views/project_partials.py b/hypha/apply/projects/views/project_partials.py
index 2763da5024..4113ffb8d3 100644
--- a/hypha/apply/projects/views/project_partials.py
+++ b/hypha/apply/projects/views/project_partials.py
@@ -1,12 +1,15 @@
+from typing import Optional
 from urllib.parse import parse_qs, urlparse
 
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count, Q
+from django.http import HttpRequest
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_GET
 
+from hypha.apply.activity.models import Activity
 from hypha.apply.activity.services import (
     get_related_actions_for_user,
 )
@@ -118,3 +121,85 @@ def get_invoices_status_counts(request):
             "type": _("Invoices"),
         },
     )
+
+
+@login_required
+def partial_get_invoice_status_table(
+    request: HttpRequest, pk: int, rejected: Optional[bool] = False
+):
+    """
+    Partial to get the invoice status table
+
+    Args:
+        request: request used to retrieve partial
+        pk: PK of the project to retrieve invoices for
+        rejected: retrieve rejected invoices, by default only retrieves not rejected invoices
+
+    Returns:
+        HttpResponse containing the table of requested invoices
+    """
+    invoices = get_object_or_404(Project, pk=pk).invoices
+
+    return render(
+        request,
+        "application_projects/partials/invoice_status_table.html",
+        context={
+            "invoices": invoices.rejected if rejected else invoices.not_rejected,
+            "user": request.user,
+            "rejected": rejected,
+        },
+    )
+
+
+@login_required
+def partial_get_invoice_status(request: HttpRequest, pk: int, invoice_pk: int):
+    """
+    Partial to get the invoice status for invoice detail view
+
+    Args:
+        request: request used to retrieve partial
+        pk: ID of the associated project
+        invoice_pk: ID of the invoice to retrieve the status of
+
+    Returns:
+        HttpResponse containing the status line of requested invoice
+    """
+    invoice = get_object_or_404(Invoice, pk=invoice_pk)
+    user = request.user
+    invoice_activities = Activity.actions.filter(
+        related_content_type__model="invoice", related_object_id=invoice.id
+    ).visible_to(user)
+
+    return render(
+        request,
+        "application_projects/partials/invoice_status.html",
+        context={
+            "object": invoice,
+            "latest_activity": invoice_activities.first(),
+            "activities": invoice_activities[1:],
+            "user": user,
+        },
+    )
+
+
+@login_required
+def partial_get_invoice_detail_actions(request: HttpRequest, pk: int, invoice_pk: int):
+    """
+    Partial to get the actions for the invoice detail view
+
+    Args:
+        request: request used to retrieve partial
+        pk: ID of the associated project
+        invoice_pk: ID of the invoice to retrieve the status of
+
+    Returns:
+        HttpResponse containing the status line of requested invoice
+    """
+    invoice = get_object_or_404(Invoice, pk=invoice_pk)
+    user = request.user
+
+    return render(
+        request,
+        "application_projects/partials/invoice_detail_actions.html",
+        context={"object": invoice, "user": user},
+    )
diff --git a/hypha/static_src/sass/components/_button.scss b/hypha/static_src/sass/components/_button.scss
index 92f21f61b2..7515097022 100644
--- a/hypha/static_src/sass/components/_button.scss
+++ b/hypha/static_src/sass/components/_button.scss
@@ -391,8 +391,11 @@
 
     &--tooltip-disabled {
         background-color: variables.$color--button-disabled;
+        border: 1px solid variables.$color--button-disabled;
 
-        &:hover {
+        &:hover,
+        &:active,
+        &:focus {
             cursor: default;
             background-color: variables.$color--button-disabled;
         }