diff --git a/odex30_base/whatsapp_mail_messaging/__manifest__.py b/odex30_base/whatsapp_mail_messaging/__manifest__.py
index fce3c1d..3ce5cc8 100644
--- a/odex30_base/whatsapp_mail_messaging/__manifest__.py
+++ b/odex30_base/whatsapp_mail_messaging/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Odoo Whatsapp Integration',
-    'version': '18.0.1.0.0',  # تغيير الإصدار إلى 18.0
+    'version': '18.0.1.0.0',
     'category': 'Sales',
     'summary': """Odoo 18 Whatsapp Integration For Sales,Contacts,Crm,Stock,Purchase,Invoice, and Floating button in Website""",
     'description': """Odoo 18 Version: Added options for sending Whatsapp messages and Mails in systray bar,sale order, invoices, 
@@ -11,7 +11,6 @@
     'company': 'Expert',
     'depends': ['base', 'contacts', 'crm', 'stock', 'sale_management', 'purchase', 'account', 'website'],
 
-    # لا نغير هذا القسم الآن، سنعالج ملفاته واحدًا تلو الآخر
     'data': [
         'security/ir.model.access.csv',
         'views/portal_whatsapp_view.xml',
@@ -26,14 +25,13 @@
         'wizard/portal_share_inherited.xml',
     ],
 
-    #  هذا هو التغيير الهيكلي الأهم في Odoo 18
-    # تم نقل تعريفات الجافاسكريبت و قوالب QWeb إلى هنا
     'assets': {
         'web.assets_backend': [
-            # '/whatsapp_mail_messaging/static/src/js/whatsapp_button.js', # معطل مؤقتاً
-            # '/whatsapp_mail_messaging/static/src/js/mail_button.js',    # معطل مؤقتاً
-            # '/whatsapp_mail_messaging/static/src/xml/whatsapp_button.xml', # معطل مؤقتاً
-            # '/whatsapp_mail_messaging/static/src/xml/mail_button.xml',    # معطل مؤقتاً
+            '/whatsapp_mail_messaging/static/src/js/whatsapp_button.js',
+            '/whatsapp_mail_messaging/static/src/js/mail_button.js',
+            '/whatsapp_mail_messaging/static/src/xml/whatsapp_button.xml',
+            '/whatsapp_mail_messaging/static/src/xml/mail_button.xml',
+            '/whatsapp_mail_messaging/static/src/css/systray_icons.css',
         ],
         'web.assets_frontend': [
             '/whatsapp_mail_messaging/static/src/css/whatsapp.css',
diff --git a/odex30_base/whatsapp_mail_messaging/model/account_move.py b/odex30_base/whatsapp_mail_messaging/model/account_move.py
index d91e615..737f31a 100644
--- a/odex30_base/whatsapp_mail_messaging/model/account_move.py
+++ b/odex30_base/whatsapp_mail_messaging/model/account_move.py
@@ -33,7 +33,6 @@ class Account(models.Model):
         compose_form_id = self.env.ref('whatsapp_mail_messaging.whatsapp_message_wizard_form').id
         ctx = dict(self.env.context)
 
-        # استخدام f-string والكشف عن القيم الفارغة لتجنب الخطأ
         partner_name = self.partner_id.name or ''
         invoice_name = self.name or ''
         total_amount = self.amount_total or 0.0
diff --git a/odex30_base/whatsapp_mail_messaging/static/src/css/systray_icons.css b/odex30_base/whatsapp_mail_messaging/static/src/css/systray_icons.css
new file mode 100644
index 0000000..a3061ef
--- /dev/null
+++ b/odex30_base/whatsapp_mail_messaging/static/src/css/systray_icons.css
@@ -0,0 +1,4 @@
+.o_systray_item .fa-whatsapp,
+.o_systray_item .fa-envelope {
+    margin: 0 5px;
+}
diff --git a/odex30_base/whatsapp_mail_messaging/static/src/js/mail_button.js b/odex30_base/whatsapp_mail_messaging/static/src/js/mail_button.js
index b25b8e0..3f407a5 100644
--- a/odex30_base/whatsapp_mail_messaging/static/src/js/mail_button.js
+++ b/odex30_base/whatsapp_mail_messaging/static/src/js/mail_button.js
@@ -1,5 +1,3 @@
-/** @odoo-module **/
-
 import { registry } from "@web/core/registry";
 import { useService } from "@web/core/utils/hooks";
 import { Component } from "@odoo/owl";
diff --git a/odex30_base/whatsapp_mail_messaging/static/src/js/whatsapp_button.js b/odex30_base/whatsapp_mail_messaging/static/src/js/whatsapp_button.js
index a9c4e2b..1582fe3 100644
--- a/odex30_base/whatsapp_mail_messaging/static/src/js/whatsapp_button.js
+++ b/odex30_base/whatsapp_mail_messaging/static/src/js/whatsapp_button.js
@@ -1,4 +1,3 @@
-
 import { registry } from "@web/core/registry";
 import { useService } from "@web/core/utils/hooks";
 import { Component } from "@odoo/owl";
diff --git a/odex30_base/whatsapp_mail_messaging/views/account_move_inherited.xml b/odex30_base/whatsapp_mail_messaging/views/account_move_inherited.xml
index 69479ff..ba0299a 100644
--- a/odex30_base/whatsapp_mail_messaging/views/account_move_inherited.xml
+++ b/odex30_base/whatsapp_mail_messaging/views/account_move_inherited.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- 1. تعديل واجهة النموذج لإضافة زر الإرسال الفردي -->
     <record model="ir.ui.view" id="account_move_form_view_inherited">
         <field name="name">account.move.form.view.inherited</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='preview_invoice']" position="after">
-                <!-- استخدام فئات Bootstrap 5 بدلاً من style المضمن -->
                 <button type="object" class="btn btn-success"
                         name="action_send_whatsapp" icon="fa-whatsapp" string="Send by Whatsapp"/>
             </xpath>
         </field>
     </record>
 
-    <!-- 2. إنشاء إجراء خادم (Server Action) لاستدعاء دالة الإرسال الجماعي -->
     <record id="action_whatsapp_multi_account_move" model="ir.actions.server">
         <field name="name">Send by Whatsapp</field>
         <field name="model_id" ref="account.model_account_move"/>
diff --git a/odex30_base/whatsapp_mail_messaging/views/contacts.xml b/odex30_base/whatsapp_mail_messaging/views/contacts.xml
index e129bbc..01fa86a 100644
--- a/odex30_base/whatsapp_mail_messaging/views/contacts.xml
+++ b/odex30_base/whatsapp_mail_messaging/views/contacts.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- 1. تعديل واجهة النموذج لإضافة زر الإرسال الفردي -->
     <record id="whatsapp_res_view_form" model="ir.ui.view">
         <field name="name">whatsapp.view.form.inherit.res</field>
         <field name="model">res.partner</field>
@@ -8,7 +7,6 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='image_1920']" position="before">
                 <div class="oe_button_box" name="button_box">
-                    <!-- استخدام فئات Bootstrap 5 بدلاً من style المضمن -->
                     <button type="object" class="btn btn-success"
                             name="action_send_whatsapp" icon="fa-whatsapp" string="Send by Whatsapp"/>
                 </div>
@@ -16,7 +14,6 @@
         </field>
     </record>
 
-    <!-- 2. إنشاء إجراء خادم (Server Action) لاستدعاء دالة الإرسال الجماعي -->
     <record id="action_whatsapp_multi_res_partner" model="ir.actions.server">
         <field name="name">Send by Whatsapp</field>
         <field name="model_id" ref="base.model_res_partner"/>
diff --git a/odex30_base/whatsapp_mail_messaging/views/crm_lead.xml b/odex30_base/whatsapp_mail_messaging/views/crm_lead.xml
index cb06dc7..40314d6 100644
--- a/odex30_base/whatsapp_mail_messaging/views/crm_lead.xml
+++ b/odex30_base/whatsapp_mail_messaging/views/crm_lead.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- 1. تعديل واجهة النموذج لإضافة زر الإرسال الفردي -->
     <record id="whatsapp_crm_view_form" model="ir.ui.view">
         <field name="name">whatsapp.view.form.inherit.crm</field>
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_lead_view_form"/>
         <field name="arch" type="xml">
-            <!-- استخدام xpath أكثر تحديدًا لضمان العثور على الـ header -->
             <xpath expr="//form/header" position="inside">
-                 <!-- استخدام فئات Bootstrap 5 بدلاً من style المضمن -->
                 <button type="object" class="btn btn-success"
                         name="action_send_whatsapp" icon="fa-whatsapp" string="Send by Whatsapp"/>
             </xpath>
         </field>
     </record>
 
-    <!-- 2. إنشاء إجراء خادم (Server Action) لاستدعاء دالة الإرسال الجماعي -->
     <record id="action_whatsapp_multi_crm_lead" model="ir.actions.server">
         <field name="name">Send by Whatsapp</field>
         <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/odex30_base/whatsapp_mail_messaging/views/purchase_order_inherited.xml b/odex30_base/whatsapp_mail_messaging/views/purchase_order_inherited.xml
index 3424293..6155024 100644
--- a/odex30_base/whatsapp_mail_messaging/views/purchase_order_inherited.xml
+++ b/odex30_base/whatsapp_mail_messaging/views/purchase_order_inherited.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- 1. تعديل واجهة النموذج لإضافة زر الإرسال الفردي -->
     <record model="ir.ui.view" id="purchase_order_form_view_inherited">
         <field name="name">purchase.order.form.view.inherited</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_rfq_send']" position="after">
-                <!-- استخدام فئات Bootstrap 5 بدلاً من style المضمن -->
                 <button type="object" class="btn btn-success"
                         name="action_send_whatsapp" icon="fa-whatsapp" string="Send by Whatsapp"/>
             </xpath>
         </field>
     </record>
 
-    <!-- 2. إنشاء إجراء خادم (Server Action) لاستدعاء دالة الإرسال الجماعي -->
     <record id="action_whatsapp_multi_purchase_order" model="ir.actions.server">
         <field name="name">Send by Whatsapp</field>
         <field name="model_id" ref="purchase.model_purchase_order"/>
diff --git a/odex30_base/whatsapp_mail_messaging/views/sale_order_inherited.xml b/odex30_base/whatsapp_mail_messaging/views/sale_order_inherited.xml
index dddff29..61e5dd2 100644
--- a/odex30_base/whatsapp_mail_messaging/views/sale_order_inherited.xml
+++ b/odex30_base/whatsapp_mail_messaging/views/sale_order_inherited.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- 1. تعديل واجهة النموذج لإضافة زر الإرسال الفردي -->
     <record model="ir.ui.view" id="sale_order_form_view_inherited">
         <field name="name">sale.order.form.view.inherited</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_quotation_send']" position="after">
-                <!-- استخدام فئات Bootstrap 5 بدلاً من style المضمن -->
                 <button type="object" class="btn btn-success"
                         name="action_send_whatsapp" icon="fa-whatsapp" string="Send by Whatsapp"/>
             </xpath>
         </field>
     </record>
 
-    <!-- 2. إنشاء إجراء خادم (Server Action) لاستدعاء دالة الإرسال الجماعي -->
     <record id="action_whatsapp_multi_sale_order" model="ir.actions.server">
         <field name="name">Send by Whatsapp</field>
         <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/odex30_base/whatsapp_mail_messaging/views/stock_picking_inherit.xml b/odex30_base/whatsapp_mail_messaging/views/stock_picking_inherit.xml
index ef13698..7f705e0 100644
--- a/odex30_base/whatsapp_mail_messaging/views/stock_picking_inherit.xml
+++ b/odex30_base/whatsapp_mail_messaging/views/stock_picking_inherit.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- 1. تعديل واجهة النموذج لإضافة زر الإرسال الفردي -->
     <record id="whatsapp_stock_view_form" model="ir.ui.view">
             <field name="name">whatsapp.view.form.inherit.stock</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='do_print_picking']" position="after">
-                <!-- استخدام فئات Bootstrap 5 بدلاً من style المضمن -->
                 <button type="object" class="btn btn-success"
                         name="action_send_whatsapp" icon="fa-whatsapp" string="Send by Whatsapp"/>
             </xpath>
         </field>
     </record>
 
-    <!-- 2. إنشاء إجراء خادم (Server Action) لاستدعاء دالة الإرسال الجماعي -->
     <record id="action_whatsapp_multi_stock_picking" model="ir.actions.server">
         <field name="name">Send by Whatsapp</field>
         <field name="model_id" ref="stock.model_stock_picking"/>
diff --git a/odex30_base/whatsapp_mail_messaging/wizard/portal_share_inherited.xml b/odex30_base/whatsapp_mail_messaging/wizard/portal_share_inherited.xml
index 4fd803e..44bd8f2 100644
--- a/odex30_base/whatsapp_mail_messaging/wizard/portal_share_inherited.xml
+++ b/odex30_base/whatsapp_mail_messaging/wizard/portal_share_inherited.xml
@@ -9,7 +9,6 @@
                 <field name="share_type" widget="radio"/>
             </xpath>
 
-            <!-- تم حذف attrs من الأزرار -->
             <xpath expr="//button[@name='action_send_mail']" position="replace">
                 <button string="Send Mail" name="action_send_mail"
                         type="object" class="btn btn-primary"/>
@@ -19,7 +18,6 @@
                         type="object" class="btn btn-success" icon="fa-whatsapp"/>
             </xpath>
 
-            <!-- تم حذف attrs من الحقول -->
             <xpath expr="//field[@name='partner_ids']" position="replace">
                 <field name="partner_ids" widget="many2many_tags_email"
                        placeholder="Add contacts to share the document..."/>