diff --git a/templates/crm/leads/lead_detail.html b/templates/crm/leads/lead_detail.html
index 3e6e0616..33be4707 100644
--- a/templates/crm/leads/lead_detail.html
+++ b/templates/crm/leads/lead_detail.html
@@ -192,7 +192,7 @@
                   </div>
                   <div class="modal-footer">
                     <button class="btn btn-phoenix-primary" type="submit">Save</button>
-                    <button class="btn btn-phoenix-primary" type="button" data-bs-dismiss="modal">Cancel</button>
+                    <button class="btn btn-phoenix-secondary" type="button" data-bs-dismiss="modal">Cancel</button>
                   </div>
                 </form>
               </div>
diff --git a/templates/crm/leads/lead_send.html b/templates/crm/leads/lead_send.html
index e17cddf5..af1be556 100644
--- a/templates/crm/leads/lead_send.html
+++ b/templates/crm/leads/lead_send.html
@@ -19,15 +19,15 @@
           </div>
         </div>
         <div class="mb-3 flex-1">
-          <textarea class="form-control" id="message" name="message" rows="15" placeholder="Message">{{message}}</textarea>
+          <textarea class="form-control h-70" id="message" name="message" rows="15" placeholder="Message">{{message}}</textarea>
         </div>
         <div class="mb-3 flex-1">
           <input class="form-control" id="email_pk" name="email_pk" type="text" hidden value="{{email_pk}}" />
         </div>
         <div class="d-flex justify-content-between align-items-center">
           <div class="d-flex gap-2">
-            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-link text-body fs-10 text-decoration-none">Discard</a>
-            <a hx-boost="true" hx-push-url='false' hx-include="#message,#subject,#to" href="{% url 'send_lead_email' lead.slug %}?status=draft" class="btn btn-phoenix-secondary text-white fs-10 text-decoration-none">Save as Draft</a>
+            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-phoenix-danger">Discard</a>
+            <a hx-boost="true" hx-push-url='false' hx-include="#message,#subject,#to" href="{% url 'send_lead_email' lead.slug %}?status=draft" class="btn btn-phoenix-success">Save as Draft</a>
             <button class="btn btn-phoenix-primary fs-10" type="submit">Send<span class="fa-solid fa-paper-plane ms-1"></span></button>
           </div>
         </div>
diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html
index da23e00f..85a87571 100644
--- a/templates/dealers/dealer_detail.html
+++ b/templates/dealers/dealer_detail.html
@@ -19,7 +19,7 @@
                         <a href="{% url 'account_change_password' %}" class="btn btn-phoenix-danger"><span class="fas fa-key me-2"></span>{{ _("Change Password") }}</a>
                     </div>
                     <div class="col-auto">
-                        <a class="btn btn-phoenix-secondary" href="{% url 'dealer_update' dealer.slug %}"><span class="fas fa-edit me-2 text-body-quaternary"></span>{{ _("Edit") }} </a>
+                        <a class="btn btn-phoenix-primary" href="{% url 'dealer_update' dealer.slug %}"><span class="fas fa-edit me-2 text-primary"></span>{{ _("Edit") }} </a>
                     </div>
                 </div>
             </div>
diff --git a/templates/footer.html b/templates/footer.html
index 6b1b355f..c4fbb04d 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -6,7 +6,7 @@
       <span class="fw-bold">Haikal</span>&nbsp;|&nbsp;<span class="fw-bold">هيكل</span>
 
     </div>
-    <div class="col-12 col-sm-auto text-center">
+    <div class="col-12 col-sm-auto text-center me-12">
       <span class="fw-light text-body-tertiary text-opacity-85">{{ _("Powered by")}} </span>
       <a class="mx-1 text-decoration-none text-body-highlight" href="https://tenhal.sa">
         <span>TENHAL</span>&nbsp;|&nbsp;<span>تنحل</span>
diff --git a/templates/items/expenses/expense_create.html b/templates/items/expenses/expense_create.html
index 7fa6bb47..d598a127 100644
--- a/templates/items/expenses/expense_create.html
+++ b/templates/items/expenses/expense_create.html
@@ -8,7 +8,7 @@
         <div class="row justify-content-center">
             <div class="col-md-8">
                 <div class="card">
-                    <div class="card-header">{{ _("Add Expense") }}</div>
+                    <div class="card-header"><h3>{{ _("Add Expense") }}</h3></div>
                     <div class="card-body">
                         <form method="post" action="">
                             {% csrf_token %}
diff --git a/templates/items/service/service_create.html b/templates/items/service/service_create.html
index 44d58317..1e2febfa 100644
--- a/templates/items/service/service_create.html
+++ b/templates/items/service/service_create.html
@@ -19,9 +19,9 @@
                 <div class="card bg-body">
                     <div class="card-header">
                         {% if service.pk %}
-                            {{ _("Update Service") }}
+                            <h3>{{ _("Update Service") }}</h3>
                         {% else %}
-                            {{ _("Add Service") }}
+                            <h3>{{ _("Add Service") }}</h3>
                         {% endif %}
                     </div>
                     <div class="card-body">
@@ -29,8 +29,8 @@
                             {% csrf_token %}
                             {{ form|crispy }}
                             <div class="d-flex justify-content-start">
-                                <button class="btn btn-sm btn-success me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i> {{ _("Save") }}</button>
-                                <a href="{{request.META.HTTP_REFERER}}" class="btn btn-sm btn-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                                <button class="btn btn-sm btn-phoenix-success me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i> {{ _("Save") }}</button>
+                                <a href="{{request.META.HTTP_REFERER}}" class="btn btn-sm btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                             </div>
 
                         </form>
diff --git a/templates/plans/billing_info_create_or_update.html b/templates/plans/billing_info_create_or_update.html
index ce44209c..3c81084b 100644
--- a/templates/plans/billing_info_create_or_update.html
+++ b/templates/plans/billing_info_create_or_update.html
@@ -11,11 +11,13 @@
                 {% csrf_token %}
                 {{ form|crispy }}
                 {% if object %}
-                    <a class="btn btn-sm btn-phoenix-danger" href="{% url 'billing_info_delete' %}"><!--<span class="far fa-trash-alt"></span>--> {{ _("Delete") }}</a>
+                    <a class="btn btn-sm btn-phoenix-danger" href="{% url 'billing_info_delete' %}"><i class="fa-solid fa-trash me-1"></i> {{ _("Delete") }}</a>
                 {% endif %}
                 <button type="submit" class="btn btn-sm btn-phoenix-success">
-                    {{ _("Save") }}
+                    <i class="fa fa-save me-1"></i>{{ _("Save") }}
                 </button>
+
+               
             </form>
         </div>
     </div>