diff --git a/odex25_purchase/odex25_evaluation_eriteria/wizard/final_evaluation_wizard.xml b/odex25_purchase/odex25_evaluation_eriteria/wizard/final_evaluation_wizard.xml
index 159ced86d..389e97d49 100644
--- a/odex25_purchase/odex25_evaluation_eriteria/wizard/final_evaluation_wizard.xml
+++ b/odex25_purchase/odex25_evaluation_eriteria/wizard/final_evaluation_wizard.xml
@@ -23,10 +23,10 @@
                 </group>
                 <footer>
                     <button name="action_create_search_html" string="View" target="_blank" type="object"
-                            class="btn-primary"/>
+                            class="btn-primary" icon="fa-eye"/>
                     <button name="action_create_search_pdf" string="Pdf" type="object"
-                            class="btn-primary"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                            class="btn-primary" icon="fa-file-pdf-o"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times"/>
                 </footer>
             </form>
         </field>
diff --git a/odex25_purchase/odex25_evaluation_eriteria/wizard/intial_evaluation_wizard.xml b/odex25_purchase/odex25_evaluation_eriteria/wizard/intial_evaluation_wizard.xml
index 499b20512..cec2d59d7 100644
--- a/odex25_purchase/odex25_evaluation_eriteria/wizard/intial_evaluation_wizard.xml
+++ b/odex25_purchase/odex25_evaluation_eriteria/wizard/intial_evaluation_wizard.xml
@@ -21,10 +21,10 @@
                 </group>
                 <footer>
                     <button name="action_create_search_html" string="View" target="_blank" type="object"
-                            class="btn-primary"/>
+                            class="btn-primary" icon="fa-eye"/>
                     <button name="action_create_search_pdf" string="Pdf" type="object"
-                            class="btn-primary"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                            class="btn-primary" icon="fa-file-pdf-o"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times"/>
                 </footer>
             </form>
         </field>
diff --git a/odex25_purchase/odex25_purchase_coc/views/views.xml b/odex25_purchase/odex25_purchase_coc/views/views.xml
index 65f8a37d9..a8f52c42d 100644
--- a/odex25_purchase/odex25_purchase_coc/views/views.xml
+++ b/odex25_purchase/odex25_purchase_coc/views/views.xml
@@ -41,11 +41,11 @@
             <field name="arch" type="xml">
                 <form string="" create="false" delete="false">
                     <header>
-                        <button name="action_confirm" type="object" class="oe_highlight" states="draft" string="Confirm"
-                                groups="odex25_purchase_coc.group_coc_user,odex25_purchase_coc.group_coc_manager"/>
+                        <button name="action_confirm" type="object" class="btn-primary" states="draft" string="Confirm"
+                                groups="odex25_purchase_coc.group_coc_user,odex25_purchase_coc.group_coc_manager" icon="fa-check-circle"/>
 
-                        <button name="action_cancel" type="object" class="oe_highlight" states="draft" string="Reject"
-                                groups="odex25_purchase_coc.group_coc_manager"/>
+                        <button name="action_cancel" type="object" class="btn-danger" states="draft" string="Reject"
+                                groups="odex25_purchase_coc.group_coc_manager" icon="fa-times-circle"/>
                             <button name="action_approve"
                                     type="object"
                                     string="Manager Approve"
@@ -62,7 +62,7 @@
                                     groups="odex25_purchase_coc.group_purchase_coc_direct_manager"
 />
 
-                        <button name="action_draft" type="object" class="oe_highlight" states="cancel" string="Set to Draft"/>
+                        <button name="action_draft" type="object" class="btn-secondary" states="cancel" string="Set to Draft" icon="fa-undo"/>
                         <field name="state" widget="statusbar"/>
                     </header>
 
diff --git a/odex25_purchase/odex25_purchase_coc/wizard/purchase_coc_partial_wizard.xml b/odex25_purchase/odex25_purchase_coc/wizard/purchase_coc_partial_wizard.xml
index 9f55467bc..6df4b66df 100644
--- a/odex25_purchase/odex25_purchase_coc/wizard/purchase_coc_partial_wizard.xml
+++ b/odex25_purchase/odex25_purchase_coc/wizard/purchase_coc_partial_wizard.xml
@@ -10,8 +10,8 @@ You have processed less product than the initial order.
                 </p>
 
                 <footer>
-                    <button name="action_confirm" string="Create Backorder" type="object" class="btn-primary"/>
-                    <button name="action_cancel" string="No Backorder" type="object" class="btn-secondary"/>
+                    <button name="action_confirm" string="Create Backorder" type="object" class="btn-primary" icon="fa-plus-circle"/>
+                    <button name="action_cancel" string="No Backorder" type="object" class="btn-secondary" icon="fa-ban"/>
                 </footer>
             </form>
         </field>
diff --git a/odex25_purchase/odex25_taqeem_purchase/views/competitve_purchase.xml b/odex25_purchase/odex25_taqeem_purchase/views/competitve_purchase.xml
index 02a88311f..3968b4a7b 100644
--- a/odex25_purchase/odex25_taqeem_purchase/views/competitve_purchase.xml
+++ b/odex25_purchase/odex25_taqeem_purchase/views/competitve_purchase.xml
@@ -21,8 +21,8 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,dm,str_pro_department,direct_manager,send_budget,wait_budget,budget_approve,general_supervisor,waiting"/>
             </xpath>
             <xpath expr="//button[@name='action_pc_confirm']" position="replace">
-                <button name="action_pc_confirm" groups="governmental_purchase.executive_director_of_purchase_and_contract" type="object" string="Approve" states="budget_approve" class="oe_highlight"/>
-                <button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse" states="budget_approve" type="action" groups="governmental_purchase.executive_director_of_purchase_and_contract"/>
+                <button name="action_pc_confirm" groups="governmental_purchase.executive_director_of_purchase_and_contract" type="object" string="Approve" states="budget_approve" class="btn-primary" icon="fa-check-circle"/>
+                <button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse" states="budget_approve" type="action" groups="governmental_purchase.executive_director_of_purchase_and_contract" class="btn-danger" icon="fa-times-circle"/>
 
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="after">
@@ -30,9 +30,9 @@
                 <field name="check_chief_executive" invisible="1"/>
             </xpath>
             <xpath expr="//button[@name='action_confirm']" position="replace">
-              <button name="action_confirm_button" groups="purchase_requisition_custom.group_direct_manger" type="object" string="Submit" class="oe_highlight" attrs="{'invisible': ['|',('check_chief_executive','=',False),('state','!=', 'dm')]}"/>
-                <button name="technical_department" type="object" groups="odex25_taqeem_purchase.strategy_project_group" string="Technical Department" states="str_pro_department" class="oe_highlight"/>
-                <button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse" type="action" groups="odex25_taqeem_purchase.strategy_project_group" states="str_pro_department"/>
+              <button name="action_confirm_button" groups="purchase_requisition_custom.group_direct_manger" type="object" string="Submit" class="btn-primary" attrs="{'invisible': ['|',('check_chief_executive','=',False),('state','!=', 'dm')]}" icon="fa-send"/>
+                <button name="technical_department" type="object" groups="odex25_taqeem_purchase.strategy_project_group" string="Technical Department" states="str_pro_department" class="btn-info" icon="fa-cogs"/>
+                <button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse" type="action" groups="odex25_taqeem_purchase.strategy_project_group" states="str_pro_department" class="btn-danger" icon="fa-times-circle"/>
             </xpath>
 <!--             <xpath expr="//field[@name='line_ids']//field[@name='sum_total']" position="attributes">
                 <attribute name="readonly">1</attribute>
diff --git a/odex25_purchase/odex25_taqeem_purchase/views/direct_purchase.xml b/odex25_purchase/odex25_taqeem_purchase/views/direct_purchase.xml
index 127c19fde..3f0008f5d 100644
--- a/odex25_purchase/odex25_taqeem_purchase/views/direct_purchase.xml
+++ b/odex25_purchase/odex25_taqeem_purchase/views/direct_purchase.xml
@@ -35,7 +35,7 @@
                         string="Approve" states="budget_approve" class="oe_highlight"/>
                 <button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse"
                         states="budget_approve" type="action"
-                        groups="governmental_purchase.executive_director_of_purchase_and_contract"/>
+                        groups="governmental_purchase.executive_director_of_purchase_and_contract" class="btn-danger" icon="fa-times-circle"/>
 
             </xpath>
 
diff --git a/odex25_purchase/odex25_taqeem_purchase/views/purchase_less_thirty_view.xml b/odex25_purchase/odex25_taqeem_purchase/views/purchase_less_thirty_view.xml
index 7c942fa78..7b9c25b3d 100644
--- a/odex25_purchase/odex25_taqeem_purchase/views/purchase_less_thirty_view.xml
+++ b/odex25_purchase/odex25_taqeem_purchase/views/purchase_less_thirty_view.xml
@@ -41,7 +41,7 @@
                 <button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse"
 
                         states="budget_approve" type="action"
-                        groups="governmental_purchase.executive_director_of_purchase_and_contract"/>
+                        groups="governmental_purchase.executive_director_of_purchase_and_contract" class="btn-danger" icon="fa-times-circle"/>
             </xpath>
             <!--            <xpath expr="//button[@name='%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d']"-->
             <!--                   position="replace">-->
diff --git a/odex25_purchase/purchase_custom_report/views/asset_custom.xml b/odex25_purchase/purchase_custom_report/views/asset_custom.xml
index 11f6132ff..48bd6c261 100644
--- a/odex25_purchase/purchase_custom_report/views/asset_custom.xml
+++ b/odex25_purchase/purchase_custom_report/views/asset_custom.xml
@@ -23,7 +23,7 @@
                         </group>
                     </sheet>
                     <footer>
-                        <button name="print_report" string="Print" type="object" class="btn-primary"/>
+                        <button name="print_report" string="Print" type="object" class="btn-primary" icon="fa-print"/>
                         <button string="Cancel" class="btn-default" special="cancel"/>
                     </footer>
                 </form>
@@ -66,7 +66,7 @@
                         </group>
                     </sheet>
                     <footer>
-                        <button name="print_report" string="Print" type="object" class="btn-primary"/>
+                        <button name="print_report" string="Print" type="object" class="btn-primary" icon="fa-print"/>
                         <button string="Cancel" class="btn-default" special="cancel"/>
                     </footer>
                 </form>
@@ -111,7 +111,7 @@
                         </group>
                     </sheet>
                     <footer>
-                        <button name="print_report" string="Print" type="object" class="btn-primary"/>
+                        <button name="print_report" string="Print" type="object" class="btn-primary" icon="fa-print"/>
                         <button string="Cancel" class="btn-default" special="cancel"/>
                     </footer>
                 </form>
diff --git a/odex25_purchase/purchase_custom_report/wizard/employee_purchase_report_wizard.xml b/odex25_purchase/purchase_custom_report/wizard/employee_purchase_report_wizard.xml
index b6c02cab5..56a44fd48 100644
--- a/odex25_purchase/purchase_custom_report/wizard/employee_purchase_report_wizard.xml
+++ b/odex25_purchase/purchase_custom_report/wizard/employee_purchase_report_wizard.xml
@@ -17,9 +17,9 @@
                         </group>
                         <footer>
                         <div>
-                            <button name="action_print" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_print" string="Print" type="object" default_focus="1" class="btn-primary" icon="fa-print"/>
                             or
-                            <button string="Cancel" class="oe_link" special="cancel" />
+                            <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times" />
                         </div>
                     </footer>
                 </form>
diff --git a/odex25_purchase/purchase_custom_report/wizard/employee_purchase_requitsion_report_wizard.xml b/odex25_purchase/purchase_custom_report/wizard/employee_purchase_requitsion_report_wizard.xml
index a1df29029..d002e40f4 100644
--- a/odex25_purchase/purchase_custom_report/wizard/employee_purchase_requitsion_report_wizard.xml
+++ b/odex25_purchase/purchase_custom_report/wizard/employee_purchase_requitsion_report_wizard.xml
@@ -18,9 +18,9 @@
                         </group>
                         <footer>
                         <div>
-                            <button name="action_print" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_print" string="Print" type="object" default_focus="1" class="btn-primary" icon="fa-print"/>
                             or
-                            <button string="Cancel" class="oe_link" special="cancel" />
+                            <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times" />
                         </div>
                     </footer>
                 </form>
diff --git a/odex25_purchase/purchase_custom_report/wizard/purchase_committee_report.xml b/odex25_purchase/purchase_custom_report/wizard/purchase_committee_report.xml
index 0cfea4602..7761f20c7 100644
--- a/odex25_purchase/purchase_custom_report/wizard/purchase_committee_report.xml
+++ b/odex25_purchase/purchase_custom_report/wizard/purchase_committee_report.xml
@@ -17,9 +17,9 @@
                         </group>
                         <footer>
                         <div>
-                            <button name="action_print" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_print" string="Print" type="object" default_focus="1" class="btn-primary" icon="fa-print"/>
                             or
-                            <button string="Cancel" class="oe_link" special="cancel" />
+                            <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times" />
                         </div>
                     </footer>
                 </form>
diff --git a/odex25_purchase/purchase_custom_report/wizard/purchase_general_report_wizard.xml b/odex25_purchase/purchase_custom_report/wizard/purchase_general_report_wizard.xml
index 79b79c35b..b6553d9f4 100644
--- a/odex25_purchase/purchase_custom_report/wizard/purchase_general_report_wizard.xml
+++ b/odex25_purchase/purchase_custom_report/wizard/purchase_general_report_wizard.xml
@@ -18,9 +18,9 @@
                         </group>
                         <footer>
                         <div>
-                            <button name="action_print" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_print" string="Print" type="object" default_focus="1" class="btn-primary" icon="fa-print"/>
                             or
-                            <button string="Cancel" class="oe_link" special="cancel" />
+                            <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times" />
                         </div>
                     </footer>
                 </form>
diff --git a/odex25_purchase/purchase_custom_report/wizard/purchase_total_report_wizard.xml b/odex25_purchase/purchase_custom_report/wizard/purchase_total_report_wizard.xml
index cbb0ae49e..d2b779347 100644
--- a/odex25_purchase/purchase_custom_report/wizard/purchase_total_report_wizard.xml
+++ b/odex25_purchase/purchase_custom_report/wizard/purchase_total_report_wizard.xml
@@ -18,9 +18,9 @@
                         </group>
                         <footer>
                         <div>
-                            <button name="action_print" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_print" string="Print" type="object" default_focus="1" class="btn-primary" icon="fa-print"/>
                             or
-                            <button string="Cancel" class="oe_link" special="cancel" />
+                            <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times" />
                         </div>
                     </footer>
                 </form>
diff --git a/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po b/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
index cffb1006a..d009394ce 100644
--- a/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
+++ b/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
@@ -3021,6 +3021,26 @@ msgstr "تم التسليم"
 msgid "Create Asset Custody"
 msgstr "إنشاء عهدة أصول"
 
+#. module: vendor_evaluation
+#: model_terms:ir.ui.view,arch_db:vendor_evaluation.vendor_evaluation_wizard_view
+msgid "Evaluate"
+msgstr "تقييم"
+
+#. module: odex25_taqeem_purchase
+#: model_terms:ir.ui.view,arch_db:odex25_taqeem_purchase.competitive_purchase_view
+msgid "Technical Department"
+msgstr "القسم الفني"
+
+#. module: odex25_purchase_coc
+#: model_terms:ir.ui.view,arch_db:odex25_purchase_coc.purchase_coc_form_view
+msgid "Create Backorder"
+msgstr "إنشاء طلب متأخر"
+
+#. module: odex25_purchase_coc
+#: model_terms:ir.ui.view,arch_db:odex25_purchase_coc.purchase_coc_form_view
+msgid "No Backorder"
+msgstr "بدون طلب متأخر"
+
 #. module: purchase_requisition_custom
 #: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_form
 msgid "Request Lines"
diff --git a/odex25_purchase/vendor_evaluation/views/account_invoice_view.xml b/odex25_purchase/vendor_evaluation/views/account_invoice_view.xml
index f506f3fbe..0669f8e71 100644
--- a/odex25_purchase/vendor_evaluation/views/account_invoice_view.xml
+++ b/odex25_purchase/vendor_evaluation/views/account_invoice_view.xml
@@ -7,7 +7,7 @@
        <field name="inherit_id" ref="account.view_move_form"/>
        <field name="arch" type="xml">
             <xpath expr="//button[last()]" position="before">
-                <button name="action_vendor_eval" type="object" string="Evaluate"/>                
+                <button name="action_vendor_eval" type="object" string="Evaluate" class="btn-info" icon="fa-star"/>                
             </xpath>
        </field>
    </record>
diff --git a/odex25_purchase/vendor_evaluation/views/purchase_orde_view.xml b/odex25_purchase/vendor_evaluation/views/purchase_orde_view.xml
index dd7bdd879..fb8181a75 100644
--- a/odex25_purchase/vendor_evaluation/views/purchase_orde_view.xml
+++ b/odex25_purchase/vendor_evaluation/views/purchase_orde_view.xml
@@ -7,7 +7,7 @@
        <field name="inherit_id" ref="purchase.purchase_order_form"/>
        <field name="arch" type="xml">
             <xpath expr="//button[@name='button_confirm']" position="before">
-                <button name="action_vendor_eval" type="object" string="Evaluate" attrs="{'invisible':[('requisition_id','=',False)]}" />                
+                <button name="action_vendor_eval" type="object" string="Evaluate" attrs="{'invisible':[('requisition_id','=',False)]}" class="btn-info" icon="fa-star" />                
             </xpath>
        </field>
    </record>
diff --git a/odex25_purchase/vendor_evaluation/views/stock.xml b/odex25_purchase/vendor_evaluation/views/stock.xml
index 0d8d51492..3ed21a560 100644
--- a/odex25_purchase/vendor_evaluation/views/stock.xml
+++ b/odex25_purchase/vendor_evaluation/views/stock.xml
@@ -7,7 +7,7 @@
        <field name="inherit_id" ref="stock.view_picking_form"/>
        <field name="arch" type="xml">
             <xpath expr="//button[@name='button_validate']" position="before">
-                <button name="action_vendor_eval" type="object" string="Evaluate"/>                
+                <button name="action_vendor_eval" type="object" string="Evaluate" class="btn-info" icon="fa-star"/>                
             </xpath>
        </field>
    </record>
diff --git a/odex25_purchase/vendor_evaluation/views/vendor_evaluatoin_view.xml b/odex25_purchase/vendor_evaluation/views/vendor_evaluatoin_view.xml
index 82a5ecc8f..472cbffe0 100644
--- a/odex25_purchase/vendor_evaluation/views/vendor_evaluatoin_view.xml
+++ b/odex25_purchase/vendor_evaluation/views/vendor_evaluatoin_view.xml
@@ -165,7 +165,7 @@
                    </group>
                     <footer>
                         <div>
-                            <button name="action_print" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_print" string="Print" type="object" default_focus="1" class="btn-primary" icon="fa-print"/>
                             or
                             <button string="Cancel" class="oe_link" special="cancel" />
                         </div>