diff --git a/static/images/logos/.DS_Store b/static/images/logos/.DS_Store
index 899b4f32..d20d3be3 100644
Binary files a/static/images/logos/.DS_Store and b/static/images/logos/.DS_Store differ
diff --git a/static/images/logos/users/app_logo_OGF1wFV.png b/static/images/logos/users/app_logo_OGF1wFV.png
new file mode 100644
index 00000000..b8addbe8
Binary files /dev/null and b/static/images/logos/users/app_logo_OGF1wFV.png differ
diff --git a/templates/sales/orders/order_details.html b/templates/sales/orders/order_details.html
index a7e59e3d..ef0672d7 100644
--- a/templates/sales/orders/order_details.html
+++ b/templates/sales/orders/order_details.html
@@ -10,10 +10,7 @@
     border-radius: 50rem;
   }
 
-  .card-header {
-            background-color: #f8f9fa;
-            border-bottom: 1px solid rgba(0,0,0,.125);
-          }
+
 
           .timeline {
             position: relative;
@@ -79,24 +76,16 @@
     <header class="bg-primary py-3">
         <div class="container">
             <div class="d-flex justify-content-between align-items-center">
-                <h1 class="h4 mb-0">
+                <h1 class="h4 mb-0 text-light">
                     <i class="fas fa-file-invoice me-2"></i>
                     {{ _("Sale Order")}} #{{ saleorder.formatted_order_id }}
                 </h1>
                 <div>
-<<<<<<< HEAD
-                    <button class="btn btn-sm btn-phoenix-light me-2">
-                        <i class="fas fa-print me-1"></i> Print
-                    </button>
-                    <button class="btn btn-sm btn-phoenix-light">
-                        <i class="fas fa-share-alt me-1"></i> Share
-=======
                     <button class="btn btn-sm btn-outline-light me-2">
                         <i class="fas fa-print me-1"></i> {{ _("Print") }}
                     </button>
                     <button class="btn btn-sm btn-outline-light">
                         <i class="fas fa-share-alt me-1"></i> {{ _("Share") }}
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                     </button>
                 </div>
             </div>
@@ -110,7 +99,7 @@
             <div class="col-lg-8 mb-4">
                 <!-- Order Summary Card -->
                 <div class="card mb-4 shadow-sm">
-                    <div class="card-header d-flex justify-content-between align-items-center bg-light">
+                    <div class="card-header d-flex justify-content-between align-items-center">
                         <h5 class="mb-0 text-primary">{{ _("Order Summary")}}</h5>
                         <span class="status-badge
                             {% if saleorder.status == 'approved' %}bg-success text-white
@@ -282,15 +271,9 @@
                 <!-- Documents Card -->
                 <div class="card mb-4 shadow-sm">
                     <div class="card-header d-flex justify-content-between align-items-center">
-<<<<<<< HEAD
-                        <h5 class="mb-0">Documents</h5>
-                        <button class="btn btn-sm btn-phoenix-primary">
-                            <i class="fas fa-plus me-1"></i> Add Document
-=======
                         <h5 class="mb-0">{{ _("Documents") }}</h5>
                         <button class="btn btn-sm btn-primary">
                             <i class="fas fa-plus me-1"></i> {{ _("Add Document")}}
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                         </button>
                     </div>
                     <div class="card-body">
@@ -335,11 +318,7 @@
                             <div class="mb-3">
                                 <textarea class="form-control" name="comment" rows="3" placeholder="Add a comment or note..." required></textarea>
                                 <div class="d-flex justify-content-end mt-2">
-<<<<<<< HEAD
-                                    <button type="submit" class="btn btn-phoenix-primary btn-sm">Post Comment</button>
-=======
                                     <button type="submit" class="btn btn-primary btn-sm">{{ _("Post Comment")}}</button>
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                                 </div>
                             </div>
                         </form>
@@ -376,52 +355,32 @@
                     <div class="card-body">
                         <div class="d-grid gap-2">
                             {% if saleorder.status == 'pending_approval' %}
-                            <button class="btn btn-phoenix-success" onclick="updateStatus('approved')">
+                            <button class="btn btn-success" onclick="updateStatus('approved')">
                                 <i class="fas fa-check-circle me-2"></i> Approve Order
                             </button>
                             {% endif %}
 
                             {% comment %} <a href="{% url 'edit_sale_order' saleorder.pk %}" class="btn btn-primary"> {% endcomment %}
-<<<<<<< HEAD
-                            <a href="" class="btn btn-phoenix-primary">
-                                <i class="fas fa-edit me-2"></i> Edit Order
-=======
                             <a href="" class="btn btn-primary">
                                 <i class="fas fa-edit me-2"></i> {{ _("Edit Order")}}
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                             </a>
 
                             {% if not saleorder.invoice %}
                             {% comment %} <a href="{% url 'create_invoice_from_order' saleorder.pk %}" class="btn btn-info"> {% endcomment %}
-<<<<<<< HEAD
-                            <a href="" class="btn btn-phoenix-info">
-                                <i class="fas fa-file-invoice-dollar me-2"></i> Create Invoice
-=======
                             <a href="" class="btn btn-info">
                                 <i class="fas fa-file-invoice-dollar me-2"></i> {{ _("Create Invoice")}}
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                             </a>
                             {% endif %}
 
                             {% if saleorder.status == 'approved' and not saleorder.actual_delivery_date %}
-<<<<<<< HEAD
-                            <button class="btn btn-phoenix-warning" data-bs-toggle="modal" data-bs-target="#deliveryModal">
-                                <i class="fas fa-truck me-2"></i> Schedule Delivery
-=======
                             <button class="btn btn-warning" data-bs-toggle="modal" data-bs-target="#deliveryModal">
                                 <i class="fas fa-truck me-2"></i> {{ _("Schedule Delivery")}}
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                             </button>
                             {% endif %}
 
                             {% if saleorder.status != 'cancelled' %}
-<<<<<<< HEAD
-                            <button class="btn btn-phoenix-danger" data-bs-toggle="modal" data-bs-target="#cancelModal">
-                                <i class="fas fa-times-circle me-2"></i> Cancel Order
-=======
                             <button class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#cancelModal">
                                 <i class="fas fa-times-circle me-2"></i> {{ _("Cancel Order")}}
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                             </button>
                             {% endif %}
                         </div>
@@ -573,13 +532,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-<<<<<<< HEAD
-                    <button type="button" class="btn btn-phoenix-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-phoenix-danger">Confirm Cancellation</button>
-=======
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ _("Close") }}</button>
                     <button type="submit" class="btn btn-danger">{{ _("Confirm Cancellation")}}</button>
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                 </div>
             </form>
         </div>
@@ -608,13 +562,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-<<<<<<< HEAD
-                    <button type="button" class="btn btn-phoenix-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-phoenix-primary">Schedule Delivery</button>
-=======
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ _("Close") }}</button>
                     <button type="submit" class="btn btn-primary">{{ _("Schedule Delivery")}}</button>
->>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
                 </div>
             </form>
         </div>