diff --git a/base/templates/cbv/company_leaves/detail_view_actions.html b/base/templates/cbv/company_leaves/detail_view_actions.html
index d1c7dd929..b3213aec5 100644
--- a/base/templates/cbv/company_leaves/detail_view_actions.html
+++ b/base/templates/cbv/company_leaves/detail_view_actions.html
@@ -1,32 +1,41 @@
-{% load basefilters %}
-{% load i18n %}
-{% if perms.leave.change_companyleave or perms.leave.delete_companyleave %}
-    {% if perms.leave.change_companyleave %}
-    <a hx-get="{% url 'company-leave-update' instance.id %}"
-    hx-target='#genericModalBody'
-    data-toggle="oh-modal-toggle"
-    data-target='#genericModal'
-    class="oh-btn oh-btn--info w-50" title="{% trans 'Edit' %}">
-    <ion-icon name="create-outline"></ion-icon>
-</a>
-{% endif %}
-{% if perms.leave.delete_companyleave %}
-<form
-hx-post="{% url 'company-leave-delete' instance.id %}"
-hx-target = "#companyleavedelete"
-hx-confirm="{% trans "Are you sure you want to delete ?" %}"
-method="post"
-style="display: contents;width:100%">
-{% csrf_token %}
-<button onclick="event.stopPropagation()" type="submit" class="oh-btn oh-btn--secondary w-50" title="{% trans 'Delete' %}">
-<ion-icon name="trash-outline" role="img" class="md hydrated" aria-label="trash outline"></ion-icon>
-</button>
+{% load basefilters i18n %}
 
+<div class="oh-btn-group">
+    {% if perms.leave.change_companyleave or perms.leave.delete_companyleave %}
+        {% if perms.leave.change_companyleave %}
+            <a
+                hx-get="{% url 'company-leave-update' instance.id %}"
+                hx-target="#genericModalBody"
+                data-toggle="oh-modal-toggle"
+                data-target="#genericModal"
+                class="oh-btn oh-btn--info w-50"
+            >
+                <ion-icon name="create-outline"></ion-icon>
+                {% trans 'Edit' %}
+            </a>
+        {% endif %}
+
+        {% if perms.leave.delete_companyleave %}
+            <a
+                hx-post="{% url 'company-leave-delete' instance.id %}"
+                hx-target="#listContainer"
+                hx-confirm="{% trans 'Are you sure you want to delete ?' %}"
+                class="oh-btn oh-btn--secondary w-50"
+            >
+                <ion-icon
+                    name="trash-outline"
+                    role="img"
+                    class="md hydrated"
+                    aria-label="trash outline"
+                ></ion-icon>
+                {% trans 'Delete' %}
+            </a>
+        {% endif %}
+    {% endif %}
+</div>
 
-{% endif %}
-{% endif %}
 {% if request.GET.query_string %}
-<script>
-    "<script>window.location.reload();</script>"
-</script>
+    <script>
+        window.location.reload();
+    </script>
 {% endif %}